smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi: Rename app and payload to include x86

Browse Source 
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 <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass
2025-02-14 20:22:26 -07:00
parent 8d62f11990
commit 88065731df
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
board/efi/Kconfig
View File

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

2
board/efi/efi-x86_payload/Kconfig
View File

@@ -1,4 +1,4 @@
if TARGET_EFI_PAYLOAD
if TARGET_EFI_X86_PAYLOAD
config SYS_BOARD
default "efi-x86_payload"