At present only x86 supports the EFI app and (apart from Qualcomm) the payload. In preparation for supporting ARM more generally, rename the existing VENDOR_EFI option to VENDOR_EFI_X86, using that to define a generic VENDOR_EFI which will be enabled for all architectures.
Signed-off-by: Simon Glass <[email protected]> --- arch/arm/Kconfig | 4 ++++ arch/x86/Kconfig | 3 ++- board/efi/Kconfig | 9 +++++++-- configs/efi-x86_app32_defconfig | 2 +- configs/efi-x86_app64_defconfig | 2 +- configs/efi-x86_payload32_defconfig | 2 +- configs/efi-x86_payload64_defconfig | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 01cb27aa1d7..b032aac4caa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2157,6 +2157,10 @@ config ARCH_GXP select OF_CONTROL imply CMD_DM +config VENDOR_EFI_ARM + bool "efi" + select VENDOR_EFI + endchoice config SUPPORT_PASSING_ATAGS diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 80396a3a2d5..69e624ae26c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -65,8 +65,9 @@ config VENDOR_COREBOOT config VENDOR_DFI bool "dfi" -config VENDOR_EFI +config VENDOR_EFI_X86 bool "efi" + select VENDOR_EFI config VENDOR_EMULATION bool "emulation" diff --git a/board/efi/Kconfig b/board/efi/Kconfig index 7545f808585..33bc364861a 100644 --- a/board/efi/Kconfig +++ b/board/efi/Kconfig @@ -1,3 +1,8 @@ +config VENDOR_EFI + bool + select OF_CONTROL + select DM_SERIAL + if VENDOR_EFI if X86 @@ -38,6 +43,6 @@ endchoice source "board/efi/efi-x86_app/Kconfig" source "board/efi/efi-x86_payload/Kconfig" -endif +endif # X86 -endif +endif # VENDOR_EFI diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig index bfcef9afa88..633b1b6c532 100644 --- a/configs/efi-x86_app32_defconfig +++ b/configs/efi-x86_app32_defconfig @@ -4,7 +4,7 @@ CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app" CONFIG_DEBUG_UART_BASE=0x0 CONFIG_DEBUG_UART_CLOCK=0 -CONFIG_VENDOR_EFI=y +CONFIG_VENDOR_EFI_X86=y CONFIG_TARGET_EFI_X86_APP32=y CONFIG_DEBUG_UART=y CONFIG_EFI=y diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig index 8f1319c0b4c..b3d1df42777 100644 --- a/configs/efi-x86_app64_defconfig +++ b/configs/efi-x86_app64_defconfig @@ -5,7 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app" CONFIG_DEBUG_UART_BASE=0x0 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_X86_RUN_64BIT=y -CONFIG_VENDOR_EFI=y +CONFIG_VENDOR_EFI_X86=y CONFIG_TARGET_EFI_X86_APP64=y CONFIG_DEBUG_UART=y CONFIG_EFI=y diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig index 48e757f629d..00f27109860 100644 --- a/configs/efi-x86_payload32_defconfig +++ b/configs/efi-x86_payload32_defconfig @@ -3,7 +3,7 @@ CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload" CONFIG_PRE_CON_BUF_ADDR=0x100000 -CONFIG_VENDOR_EFI=y +CONFIG_VENDOR_EFI_X86=y CONFIG_TARGET_EFI_X86_PAYLOAD=y CONFIG_EFI=y CONFIG_EFI_STUB=y diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig index 2606ac261c1..a22d180a591 100644 --- a/configs/efi-x86_payload64_defconfig +++ b/configs/efi-x86_payload64_defconfig @@ -3,7 +3,7 @@ CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x1000 CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload" CONFIG_PRE_CON_BUF_ADDR=0x100000 -CONFIG_VENDOR_EFI=y +CONFIG_VENDOR_EFI_X86=y CONFIG_TARGET_EFI_X86_PAYLOAD=y CONFIG_EFI=y CONFIG_EFI_STUB=y -- 2.43.0
