Since we plan to support the EFI app and payload on 64-bit ARM too,
rename the x86 target.
Adjust the Kconfig rules to allow non-x86 builds to be added.
Signed-off-by: Simon Glass <s...@chromium.org>
Reviewed-by: Tom Rini <tr...@konsulko.com>
---
Changes in v2:
- Mention '64-bit ARM' here, rather than just 'ARM'
board/efi/Kconfig | 12 ++++++++----
board/efi/efi-x86_payload/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 +-
6 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/board/efi/Kconfig b/board/efi/Kconfig
index 3df6e31c8ba..9027ca8482c 100644
--- a/board/efi/Kconfig
+++ b/board/efi/Kconfig
@@ -4,7 +4,7 @@ choice
prompt "Mainboard model"
optional
-config TARGET_EFI_APP32
+config TARGET_EFI_X86_APP32
bool "32-bit efi application"
select EFI_APP
help
@@ -13,17 +13,17 @@ config TARGET_EFI_APP32
takes over once the RAM, video and CPU are fully running.
U-Boot is loaded as an application from EFI.
-config TARGET_EFI_APP64
+config TARGET_EFI_X86_APP64
bool "64-bit efi application"
select EFI_APP
- select X86_64
+ select X86_64 if X86
help
This target is used for running U-Boot on top of EFI in 64-bit mode.
In this case EFI does the early initialisation, and U-Boot
takes over once the RAM, video and CPU are fully running.
U-Boot is loaded as an application from EFI.
-config TARGET_EFI_PAYLOAD
+config TARGET_EFI_X86_PAYLOAD
bool "efi payload"
help
This target is used for running U-Boot on top of EFI. In
@@ -33,7 +33,11 @@ config TARGET_EFI_PAYLOAD
endchoice
+if X86
+
source "board/efi/efi-x86_app/Kconfig"
source "board/efi/efi-x86_payload/Kconfig"
endif
+
+endif
diff --git a/board/efi/efi-x86_payload/Kconfig
b/board/efi/efi-x86_payload/Kconfig
index c500ca02ebf..d181bf6de09 100644
--- a/board/efi/efi-x86_payload/Kconfig
+++ b/board/efi/efi-x86_payload/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_EFI_PAYLOAD
+if TARGET_EFI_X86_PAYLOAD
config SYS_BOARD
default "efi-x86_payload"
diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig
index b20c85f1cff..bfcef9afa88 100644
--- a/configs/efi-x86_app32_defconfig
+++ b/configs/efi-x86_app32_defconfig
@@ -5,7 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi-x86_app"
CONFIG_DEBUG_UART_BASE=0x0
CONFIG_DEBUG_UART_CLOCK=0
CONFIG_VENDOR_EFI=y
-CONFIG_TARGET_EFI_APP32=y
+CONFIG_TARGET_EFI_X86_APP32=y
CONFIG_DEBUG_UART=y
CONFIG_EFI=y
CONFIG_FIT=y
diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig
index 0988ad45205..8f1319c0b4c 100644
--- a/configs/efi-x86_app64_defconfig
+++ b/configs/efi-x86_app64_defconfig
@@ -6,7 +6,7 @@ CONFIG_DEBUG_UART_BASE=0x0
CONFIG_DEBUG_UART_CLOCK=0
CONFIG_X86_RUN_64BIT=y
CONFIG_VENDOR_EFI=y
-CONFIG_TARGET_EFI_APP64=y
+CONFIG_TARGET_EFI_X86_APP64=y
CONFIG_DEBUG_UART=y
CONFIG_EFI=y
CONFIG_EFI_APP_64BIT=y
diff --git a/configs/efi-x86_payload32_defconfig
b/configs/efi-x86_payload32_defconfig
index 957fd83e432..48e757f629d 100644
--- a/configs/efi-x86_payload32_defconfig
+++ b/configs/efi-x86_payload32_defconfig
@@ -4,7 +4,7 @@ CONFIG_ENV_SIZE=0x1000
CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload"
CONFIG_PRE_CON_BUF_ADDR=0x100000
CONFIG_VENDOR_EFI=y
-CONFIG_TARGET_EFI_PAYLOAD=y
+CONFIG_TARGET_EFI_X86_PAYLOAD=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_FIT=y
diff --git a/configs/efi-x86_payload64_defconfig
b/configs/efi-x86_payload64_defconfig
index 71612d7fb19..2606ac261c1 100644
--- a/configs/efi-x86_payload64_defconfig
+++ b/configs/efi-x86_payload64_defconfig
@@ -4,7 +4,7 @@ CONFIG_ENV_SIZE=0x1000
CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload"
CONFIG_PRE_CON_BUF_ADDR=0x100000
CONFIG_VENDOR_EFI=y
-CONFIG_TARGET_EFI_PAYLOAD=y
+CONFIG_TARGET_EFI_X86_PAYLOAD=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_EFI_STUB_64BIT=y
--
2.43.0
