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

than opt-in.
 -----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEnNKg2mrY9zMBdeK7wjcgfpV0+n0FAluhbwxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDlD
 RDJBMERBNkFEOEY3MzMwMTc1RTJCQkMyMzcyMDdFOTU3NEZBN0QACgkQwjcgfpV0
 +n1DAQf/Z1Q4IiyxbgcWBcbU9UEXoZu7mMNYMcNqTNdGuFmQ2SViA8U5p8Iy6p18
 MPP2w8Cm3evbKCfE1LcRtCoCwDEMy/gL/+pDrN1PtrOO8eX9fvI9GqgsUOIuhSQb
 9WnQj+uoaaT2MZoEd+lzJavfM+T2s+wpCz/rDS4pBVNlm2c9qQEzA4l0KgXdWCfY
 Nmhy/nbTcUF0KnsrNiMzzJj6Gc9KrWkx2071WDPAWdDLJGGiu3+FCG8dXPTiK3jq
 qqR+vAaL/YMHpO9E7B+Ecdba3XFRSMUQ2UwVNUoFKY3GicuTEYhsUygOg7kr5yTb
 H3cxLjFjKlqrXI/YgYNX1gr+7Dt7LQ==
 =aLd2
 -----END PGP SIGNATURE-----

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.
This commit is contained in:
Thomas Gleixner 2018-09-19 00:12:06 +02:00
commit 008d2f4442

View File

@ -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"