summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-23 08:06:54 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-23 08:06:54 +0200
commitea092676b0d9c13f20a3bc02c5b0bf537c27346e (patch)
tree62dffcf80148d7e4c1f054a470d302eefbc2e292
parent10dc890d4228cd17ddfd09ba9aaa9221627e29b2 (diff)
parent008d2f444222554289867e1686f1be1c1bcd0ef4 (diff)
downloadlinux-ea092676b0d9c13f20a3bc02c5b0bf537c27346e.tar.gz
linux-ea092676b0d9c13f20a3bc02c5b0bf537c27346e.tar.bz2
linux-ea092676b0d9c13f20a3bc02c5b0bf537c27346e.zip
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Thomas writes: "Make the EFI arm stub device tree loader default on to unbreak existing EFI boot loaders which do not have DTB support." * 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi/libstub/arm: default EFI_ARMSTUB_DTB_LOADER to y
-rw-r--r--drivers/firmware/efi/Kconfig9
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"