Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Pull EFI fix from Ard Biesheuvel:

  Apply a fix from Scott to make the ARM stub's DTB loader opt-out rather
  than opt-in.

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index d8e159feb573..89110dfc7127 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -90,14 +90,17 @@ config EFI_ARMSTUB
 config EFI_ARMSTUB_DTB_LOADER
         bool "Enable the DTB loader"
         depends on EFI_ARMSTUB
+        default y
         help
           Select this config option to add support for the dtb= command
           line parameter, allowing a device tree blob to be loaded into
           memory from the EFI System Partition by the stub.
 
-          The device tree is typically provided by the platform or by
-          the bootloader, so this option is mostly for development
-          purposes only.
+          If the device tree is provided by the platform or by
+          the bootloader this option may not be needed.
+          But, for various development reasons and to maintain existing
+          functionality for bootloaders that do not have such support
+          this option is necessary.
 
 config EFI_BOOTLOADER_CONTROL
         tristate "EFI Bootloader Control"