diff --git a/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER b/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER
index 2066ba266..d729d29d3 100644
--- a/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER
+++ b/configs/fedora/generic/arm/CONFIG_EFI_ARMSTUB_DTB_LOADER
@@ -1 +1 @@
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index f0702ab0e..c10b53156 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1654,7 +1654,7 @@ CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index fc24f94bb..1bd38f7b6 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1644,7 +1644,7 @@ CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 2eec6d6b3..5ed9b3848 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1752,7 +1752,7 @@ CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 67db7f521..a7a8c785b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1661,7 +1661,7 @@ CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 76b7ffd51..229e98182 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1651,7 +1651,7 @@ CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 73b9a11c9..d5301ce93 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1742,7 +1742,7 @@ CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 # CONFIG_EFI_ALLOW_SECURE_BOOT_EXIT is not set
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_ARMSTUB_DTB_LOADER=y
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 CONFIG_EFI_PARTITION=y