Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea092676 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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
parents 10dc890d 008d2f44

drivers/firmware/efi/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -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"