The 'vendor' concept comes from arch/x86. Rather than letting this
spread around the tree, rename it to ARCH_EFI.
While EFI is not quite an architecture in the strict sense, it is
similar to sandbox in that it sits somewhat above the CPU architecture.
Signed-off-by: Simon Glass <s...@chromium.org>
---
Ideas for a better name are welcome.
(no changes since v2)
Changes in v2:
- Add new patch to rename VENDOR_EFI to ARCH_EFI
arch/arm/lib/crt0_aarch64_efi.S | 2 +-
arch/arm/lib/crt0_arm_efi.S | 2 +-
arch/riscv/lib/crt0_riscv_efi.S | 2 +-
arch/x86/Kconfig | 2 +-
board/efi/Kconfig | 2 +-
configs/efi-x86_app32_defconfig | 2 +-
configs/efi-x86_app64_defconfig | 2 +-
configs/efi-x86_payload32_defconfig | 2 +-
configs/efi-x86_payload64_defconfig | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/lib/crt0_aarch64_efi.S b/arch/arm/lib/crt0_aarch64_efi.S
index fe6eca576ec..f1d5de6a93d 100644
--- a/arch/arm/lib/crt0_aarch64_efi.S
+++ b/arch/arm/lib/crt0_aarch64_efi.S
@@ -66,7 +66,7 @@ extra_header_fields:
.long _start - ImageBase /* SizeOfHeaders */
.long 0 /* CheckSum */
.short IMAGE_SUBSYSTEM_EFI_APPLICATION /* Subsystem */
-#if CONFIG_VENDOR_EFI
+#if CONFIG_ARCH_EFI
.short 0 /* DllCharacteristics */
#else
.short IMAGE_DLLCHARACTERISTICS_NX_COMPAT
diff --git a/arch/arm/lib/crt0_arm_efi.S b/arch/arm/lib/crt0_arm_efi.S
index b5dfd4e3819..f58256223aa 100644
--- a/arch/arm/lib/crt0_arm_efi.S
+++ b/arch/arm/lib/crt0_arm_efi.S
@@ -65,7 +65,7 @@ extra_header_fields:
.long _start - image_base /* SizeOfHeaders */
.long 0 /* CheckSum */
.short IMAGE_SUBSYSTEM_EFI_APPLICATION /* Subsystem */
-#if CONFIG_VENDOR_EFI
+#if CONFIG_ARCH_EFI
.short 0 /* DllCharacteristics */
#else
.short IMAGE_DLLCHARACTERISTICS_NX_COMPAT
diff --git a/arch/riscv/lib/crt0_riscv_efi.S b/arch/riscv/lib/crt0_riscv_efi.S
index c7a4559eac8..424f18480fa 100644
--- a/arch/riscv/lib/crt0_riscv_efi.S
+++ b/arch/riscv/lib/crt0_riscv_efi.S
@@ -96,7 +96,7 @@ extra_header_fields:
.long _start - ImageBase /* SizeOfHeaders */
.long 0 /* CheckSum */
.short IMAGE_SUBSYSTEM_EFI_APPLICATION /* Subsystem */
-#if CONFIG_VENDOR_EFI
+#if CONFIG_ARCH_EFI
.short 0 /* DllCharacteristics */
#else
.short IMAGE_DLLCHARACTERISTICS_NX_COMPAT
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 80396a3a2d5..8c225f314ff 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -65,7 +65,7 @@ config VENDOR_COREBOOT
config VENDOR_DFI
bool "dfi"
-config VENDOR_EFI
+config ARCH_EFI
bool "efi"
config VENDOR_EMULATION
diff --git a/board/efi/Kconfig b/board/efi/Kconfig
index 7545f808585..05ac8d15d49 100644
--- a/board/efi/Kconfig
+++ b/board/efi/Kconfig
@@ -1,4 +1,4 @@
-if VENDOR_EFI
+if ARCH_EFI
if X86
diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig
index bfcef9afa88..0cdfe467f53 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_ARCH_EFI=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..ca3f084ef4c 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_ARCH_EFI=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..d96228c0694 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_ARCH_EFI=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..9e055da297c 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_ARCH_EFI=y
CONFIG_TARGET_EFI_X86_PAYLOAD=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
--
2.43.0
