diff options
author | 2018-09-30 08:06:14 -0700 | |
---|---|---|
committer | 2018-09-30 08:06:14 -0700 | |
commit | 29c222d1a9f503de4d26d8de8e955be190526adf (patch) | |
tree | b924723f1eeb43cfb2a080af56b4aaab26877036 /drivers/firmware | |
parent | nvmem: make nvmem_add_cells() static (diff) | |
parent | Linux 4.19-rc6 (diff) | |
download | linux-29c222d1a9f503de4d26d8de8e955be190526adf.tar.gz linux-29c222d1a9f503de4d26d8de8e955be190526adf.tar.bz2 linux-29c222d1a9f503de4d26d8de8e955be190526adf.zip |
Merge 4.19-rc6
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware')
-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" |