diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-09-19 00:12:06 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-09-19 00:12:06 +0200 |
| commit | 008d2f444222554289867e1686f1be1c1bcd0ef4 (patch) | |
| tree | 436f83468dda07b9c7b1ee14fb129ecd926f65e8 | |
| parent | 11da3a7f84f19c26da6f86af878298694ede0804 (diff) | |
| parent | d310959365942b100f79b56bcce859968fe7ca9c (diff) | |
| download | lwn-008d2f444222554289867e1686f1be1c1bcd0ef4.tar.gz lwn-008d2f444222554289867e1686f1be1c1bcd0ef4.zip | |
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.
| -rw-r--r-- | drivers/firmware/efi/Kconfig | 9 |
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" |