diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 16:15:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-05 16:15:32 -0400 |
commit | c3c55a07203947f72afa50a3218460b27307c47d (patch) | |
tree | de3a2f8adbb3bea4bba1df0f709b0d6c1f4e87b7 /drivers/firmware/efi/Kconfig | |
parent | 046f153343e33dcad1be7f6249ea6ff1c6fd9b58 (diff) | |
parent | 74bcc2499291d38b6253f9dbd6af33a195222208 (diff) |
Merge branch 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
Pull ARM64 EFI update from Peter Anvin:
"By agreement with the ARM64 EFI maintainers, we have agreed to make
-tip the upstream for all EFI patches. That is why this patchset
comes from me :)
This patchset enables EFI stub support for ARM64, like we already have
on x86"
* 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
arm64: efi: only attempt efi map setup if booting via EFI
efi/arm64: ignore dtb= when UEFI SecureBoot is enabled
doc: arm64: add description of EFI stub support
arm64: efi: add EFI stub
doc: arm: add UEFI support documentation
arm64: add EFI runtime services
efi: Add shared FDT related functions for ARM/ARM64
arm64: Add function to create identity mappings
efi: add helper function to get UEFI params from FDT
doc: efi-stub.txt updates for ARM
lib: add fdt_empty_tree.c
Diffstat (limited to 'drivers/firmware/efi/Kconfig')
-rw-r--r-- | drivers/firmware/efi/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig index 1e75f48b61f8..d420ae2d3413 100644 --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig | |||
@@ -47,6 +47,13 @@ config EFI_RUNTIME_MAP | |||
47 | 47 | ||
48 | See also Documentation/ABI/testing/sysfs-firmware-efi-runtime-map. | 48 | See also Documentation/ABI/testing/sysfs-firmware-efi-runtime-map. |
49 | 49 | ||
50 | config EFI_PARAMS_FROM_FDT | ||
51 | bool | ||
52 | help | ||
53 | Select this config option from the architecture Kconfig if | ||
54 | the EFI runtime support gets system table address, memory | ||
55 | map address, and other parameters from the device tree. | ||
56 | |||
50 | endmenu | 57 | endmenu |
51 | 58 | ||
52 | config UEFI_CPER | 59 | config UEFI_CPER |