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

efi: Rename CONFIG_EFI to CONFIG_EFI_CLIENT

Browse Source 
The generic name 'EFI' would be more useful for common EFI features. At
present it just refers to the EFI app and stub, which is confusing.

Rename it to EFI_CLIENT

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-05-23 14:06:40 +01:00
parent 5f4327ec9f
commit ca1f2dbd8e
19 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/global_data.h
View File

@@ -108,7 +108,7 @@ struct arch_global_data {
#ifdef CONFIG_SMBIOS #ifdef CONFIG_SMBIOS
ulong smbios_start; /* Start address of SMBIOS table */ ulong smbios_start; /* Start address of SMBIOS table */
#endif #endif
#ifdef CONFIG_EFI #ifdef CONFIG_EFI_CLIENT
ulong table; /* holds the table address from previous EFI firmware */ ulong table; /* holds the table address from previous EFI firmware */
#endif #endif
}; };

6
arch/x86/Kconfig
View File

@@ -367,7 +367,7 @@ config USE_HOB
config HAVE_FSP config HAVE_FSP
bool "Add an Firmware Support Package binary" bool "Add an Firmware Support Package binary"
depends on !EFI depends on !EFI_CLIENT
select USE_HOB select USE_HOB
select HAS_ROM select HAS_ROM
help help
@@ -515,7 +515,7 @@ config FSP_BROKEN_HOB
config ENABLE_MRC_CACHE config ENABLE_MRC_CACHE
bool "Enable MRC cache" bool "Enable MRC cache"
depends on !EFI && !SYS_COREBOOT depends on !EFI_CLIENT && !SYS_COREBOOT
help help
Enable this feature to cause MRC data to be cached in NV storage Enable this feature to cause MRC data to be cached in NV storage
to be used for speeding up boot time on future reboots and/or to be used for speeding up boot time on future reboots and/or
@@ -754,7 +754,7 @@ config HAVE_P2SB
devices. devices.
menu "System tables" menu "System tables"
depends on !EFI && !SYS_COREBOOT depends on !EFI_CLIENT && !SYS_COREBOOT
config GENERATE_PIRQ_TABLE config GENERATE_PIRQ_TABLE
bool "Generate a PIRQ table" bool "Generate a PIRQ table"

2
arch/x86/cpu/Makefile
View File

@@ -47,7 +47,7 @@ obj-$(CONFIG_INTEL_BRASWELL) += braswell/
obj-$(CONFIG_INTEL_BROADWELL) += broadwell/ obj-$(CONFIG_INTEL_BROADWELL) += broadwell/
obj-$(CONFIG_SYS_COREBOOT) += coreboot/ obj-$(CONFIG_SYS_COREBOOT) += coreboot/
obj-$(CONFIG_SYS_SLIMBOOTLOADER) += slimbootloader/ obj-$(CONFIG_SYS_SLIMBOOTLOADER) += slimbootloader/
obj-$(CONFIG_EFI) += efi/ obj-$(CONFIG_EFI_CLIENT) += efi/
obj-$(CONFIG_QEMU) += qemu/ obj-$(CONFIG_QEMU) += qemu/
obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/
obj-$(CONFIG_INTEL_QUARK) += quark/ obj-$(CONFIG_INTEL_QUARK) += quark/

2
arch/x86/cpu/efi/Kconfig
View File

@@ -1,4 +1,4 @@
if EFI if EFI_CLIENT
config SYS_CAR_ADDR config SYS_CAR_ADDR
hex hex

2
arch/x86/cpu/x86_64/Makefile
View File

@@ -5,6 +5,6 @@
obj-y += cpu.o interrupts.o setjmp.o obj-y += cpu.o interrupts.o setjmp.o
ifndef CONFIG_EFI ifndef CONFIG_EFI_CLIENT
obj-y += misc.o obj-y += misc.o
endif endif

2
cmd/Makefile
View File

@@ -67,7 +67,7 @@ obj-$(CONFIG_CMD_EXTENSION) += extension_board.o
obj-$(CONFIG_CMD_ECHO) += echo.o obj-$(CONFIG_CMD_ECHO) += echo.o
obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o obj-$(CONFIG_ENV_IS_IN_EEPROM) += eeprom.o
obj-$(CONFIG_CMD_EEPROM) += eeprom.o obj-$(CONFIG_CMD_EEPROM) += eeprom.o
obj-$(CONFIG_EFI) += efi.o efi_common.o obj-$(CONFIG_EFI_CLIENT) += efi.o efi_common.o
obj-$(CONFIG_CMD_EFIDEBUG) += efidebug.o efi_common.o obj-$(CONFIG_CMD_EFIDEBUG) += efidebug.o efi_common.o
obj-$(CONFIG_CMD_EFICONFIG) += eficonfig.o obj-$(CONFIG_CMD_EFICONFIG) += eficonfig.o
obj-$(CONFIG_CMD_EFI_GET_ENV) += efigetenv.o obj-$(CONFIG_CMD_EFI_GET_ENV) += efigetenv.o

10
cmd/part_find.c
View File

@@ -10,7 +10,7 @@
#include <dm.h> #include <dm.h>
#include <env.h> #include <env.h>
#include <part.h> #include <part.h>
#if defined(CONFIG_EFI) || defined(CONFIG_EFI_APP) #if defined(CONFIG_EFI_CLIENT) || defined(CONFIG_EFI_APP)
#include <efi.h> #include <efi.h>
#include <efi_api.h> #include <efi_api.h>
@@ -51,7 +51,7 @@ static bool partition_is_on_device(const struct efi_device_path *device,
static int part_find(int argc, char *const argv[]) static int part_find(int argc, char *const argv[])
{ {
#if defined(CONFIG_EFI) || defined(CONFIG_EFI_APP) #if defined(CONFIG_EFI_CLIENT) || defined(CONFIG_EFI_APP)
efi_guid_t efi_devpath_guid = EFI_DEVICE_PATH_PROTOCOL_GUID; efi_guid_t efi_devpath_guid = EFI_DEVICE_PATH_PROTOCOL_GUID;
struct efi_device_path *loaded_image_path = NULL; struct efi_device_path *loaded_image_path = NULL;
struct efi_boot_services *boot = efi_get_boot(); struct efi_boot_services *boot = efi_get_boot();
@@ -70,7 +70,7 @@ static int part_find(int argc, char *const argv[])
if (argc != 2) if (argc != 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
#if defined(CONFIG_EFI) || defined (CONFIG_EFI_APP) #if defined(CONFIG_EFI_CLIENT) || defined(CONFIG_EFI_APP)
part_self = !strncmp(argv[1], "self", 6); part_self = !strncmp(argv[1], "self", 6);
if (part_self) { if (part_self) {
ret = boot->handle_protocol(priv->loaded_image->device_handle, ret = boot->handle_protocol(priv->loaded_image->device_handle,
@@ -95,7 +95,7 @@ static int part_find(int argc, char *const argv[])
if (udev->driver != entry) if (udev->driver != entry)
continue; continue;
desc = dev_get_uclass_plat(udev); desc = dev_get_uclass_plat(udev);
#if defined(CONFIG_EFI) || defined(CONFIG_EFI_APP) #if defined(CONFIG_EFI_CLIENT) || defined(CONFIG_EFI_APP)
if (part_self) { if (part_self) {
if (desc->if_type == IF_TYPE_EFI_MEDIA) { if (desc->if_type == IF_TYPE_EFI_MEDIA) {
struct efi_media_plat *plat = struct efi_media_plat *plat =
@@ -131,7 +131,7 @@ static int part_find(int argc, char *const argv[])
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }
} }
#if defined(CONFIG_EFI) || defined(CONFIG_EFI_APP) #if defined(CONFIG_EFI_CLIENT) || defined(CONFIG_EFI_APP)
} }
#endif #endif
} }

2
configs/efi-arm_app64_defconfig
View File

@@ -8,7 +8,7 @@ CONFIG_DEBUG_UART_BASE=0x0
CONFIG_DEBUG_UART_CLOCK=0 CONFIG_DEBUG_UART_CLOCK=0
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_TARGET_EFI_ARM_APP64=y CONFIG_TARGET_EFI_ARM_APP64=y
CONFIG_EFI=y CONFIG_EFI_CLIENT=y
CONFIG_EFI_APP_64BIT=y CONFIG_EFI_APP_64BIT=y
CONFIG_FIT=y CONFIG_FIT=y
# CONFIG_BOOTSTD is not set # CONFIG_BOOTSTD is not set

2
configs/efi-x86_app32_defconfig
View File

@@ -7,7 +7,7 @@ CONFIG_DEBUG_UART_CLOCK=0
CONFIG_ARCH_EFI_X86=y CONFIG_ARCH_EFI_X86=y
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_TARGET_EFI_X86_APP32=y CONFIG_TARGET_EFI_X86_APP32=y
CONFIG_EFI=y CONFIG_EFI_CLIENT=y
CONFIG_FIT=y CONFIG_FIT=y
# CONFIG_BOOTSTD is not set # CONFIG_BOOTSTD is not set
CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_SHOW_BOOT_PROGRESS=y

2
configs/efi-x86_app64_defconfig
View File

@@ -8,7 +8,7 @@ CONFIG_X86_RUN_64BIT=y
CONFIG_ARCH_EFI_X86=y CONFIG_ARCH_EFI_X86=y
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_TARGET_EFI_X86_APP64=y CONFIG_TARGET_EFI_X86_APP64=y
CONFIG_EFI=y CONFIG_EFI_CLIENT=y
CONFIG_EFI_APP_64BIT=y CONFIG_EFI_APP_64BIT=y
CONFIG_FIT=y CONFIG_FIT=y
# CONFIG_BOOTSTD is not set # CONFIG_BOOTSTD is not set

2
configs/efi-x86_payload32_defconfig
View File

@@ -5,7 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload"
CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_PRE_CON_BUF_ADDR=0x100000
CONFIG_ARCH_EFI_X86=y CONFIG_ARCH_EFI_X86=y
CONFIG_TARGET_EFI_X86_PAYLOAD=y CONFIG_TARGET_EFI_X86_PAYLOAD=y
CONFIG_EFI=y CONFIG_EFI_CLIENT=y
CONFIG_EFI_STUB=y CONFIG_EFI_STUB=y
CONFIG_FIT=y CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y CONFIG_FIT_SIGNATURE=y

2
configs/efi-x86_payload64_defconfig
View File

@@ -5,7 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload"
CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_PRE_CON_BUF_ADDR=0x100000
CONFIG_ARCH_EFI_X86=y CONFIG_ARCH_EFI_X86=y
CONFIG_TARGET_EFI_X86_PAYLOAD=y CONFIG_TARGET_EFI_X86_PAYLOAD=y
CONFIG_EFI=y CONFIG_EFI_CLIENT=y
CONFIG_EFI_STUB=y CONFIG_EFI_STUB=y
CONFIG_EFI_STUB_64BIT=y CONFIG_EFI_STUB_64BIT=y
CONFIG_FIT=y CONFIG_FIT=y

6
doc/develop/uefi/u-boot_on_efi.rst
View File

@@ -46,7 +46,7 @@ First choose a board that has EFI support and obtain an EFI implementation
for that board. It will be either 32-bit or 64-bit. Alternatively, you can for that board. It will be either 32-bit or 64-bit. Alternatively, you can
opt for using QEMU [1] and the OVMF [2], as detailed below. opt for using QEMU [1] and the OVMF [2], as detailed below.
To build U-Boot as an EFI application, enable CONFIG_EFI and CONFIG_EFI_APP. To build U-Boot as an EFI application, enable CONFIG_EFI_CLIENT and CONFIG_EFI_APP.
The efi-x86_app32 and efi-x86_app64 configs are set up for this. Just build The efi-x86_app32 and efi-x86_app64 configs are set up for this. Just build
U-Boot as normal, e.g.:: U-Boot as normal, e.g.::
@@ -54,7 +54,7 @@ U-Boot as normal, e.g.::
make make
To build U-Boot as an EFI payload (32-bit or 64-bit EFI can be used), enable To build U-Boot as an EFI payload (32-bit or 64-bit EFI can be used), enable
CONFIG_EFI, CONFIG_EFI_STUB, and select either CONFIG_EFI_STUB_32BIT or CONFIG_EFI_CLIENT, CONFIG_EFI_STUB, and select either CONFIG_EFI_STUB_32BIT or
CONFIG_EFI_STUB_64BIT. The efi-x86_payload configs (efi-x86_payload32_defconfig CONFIG_EFI_STUB_64BIT. The efi-x86_payload configs (efi-x86_payload32_defconfig
and efi-x86_payload32_defconfig) are set up for this. Then build U-Boot as and efi-x86_payload32_defconfig) are set up for this. Then build U-Boot as
normal, e.g.:: normal, e.g.::
@@ -121,7 +121,7 @@ and board_init_r()).
Since U-Boot limits its memory access to the allocated regions very little Since U-Boot limits its memory access to the allocated regions very little
special code is needed. The CONFIG_EFI_APP option controls a few things special code is needed. The CONFIG_EFI_APP option controls a few things
that need to change so 'git grep CONFIG_EFI_APP' may be instructive. that need to change so 'git grep CONFIG_EFI_APP' may be instructive.
The CONFIG_EFI option controls more general EFI adjustments. The CONFIG_EFI_CLIENT option controls more general EFI adjustments.
The only available driver is the serial driver. This calls back into EFI The only available driver is the serial driver. This calls back into EFI
'boot services' to send and receive characters. Although it is implemented 'boot services' to send and receive characters. Although it is implemented

2
drivers/block/Kconfig
View File

@@ -96,7 +96,7 @@ config TPL_BLOCK_CACHE
config EFI_MEDIA config EFI_MEDIA
bool "Support EFI media drivers" bool "Support EFI media drivers"
default y if EFI || SANDBOX default y if EFI_CLIENT || SANDBOX
select BLK select BLK
help help
Enable this to support media devices on top of UEFI. This enables Enable this to support media devices on top of UEFI. This enables

2
include/init.h
View File

@@ -18,7 +18,7 @@
* In case of the EFI app the UEFI firmware provides the low-level * In case of the EFI app the UEFI firmware provides the low-level
* initialisation. * initialisation.
*/ */
#ifdef CONFIG_EFI #ifdef CONFIG_EFI_CLIENT
#define ll_boot_init() false #define ll_boot_init() false
#else #else
#include <asm/global_data.h> #include <asm/global_data.h>

2
lib/Kconfig
View File

@@ -1072,7 +1072,7 @@ config VPL_OF_LIBFDT_ASSUME_MASK
unsafe execution. See FDT_ASSUME_PERFECT, etc. in libfdt_internal.h unsafe execution. See FDT_ASSUME_PERFECT, etc. in libfdt_internal.h
menu "System tables" menu "System tables"
depends on (!EFI && !SYS_COREBOOT) || (ARM && EFI_LOADER) depends on (!EFI_CLIENT && !SYS_COREBOOT) || (ARM && EFI_LOADER)
config BLOBLIST_TABLES config BLOBLIST_TABLES
bool "Put tables in a bloblist" bool "Put tables in a bloblist"

2
lib/Makefile
View File

@@ -5,7 +5,7 @@
ifndef CONFIG_XPL_BUILD ifndef CONFIG_XPL_BUILD
obj-$(CONFIG_EFI) += efi_client/ obj-$(CONFIG_EFI_CLIENT) += efi_client/
obj-$(CONFIG_EFI_LOADER) += efi_driver/ obj-$(CONFIG_EFI_LOADER) += efi_driver/
obj-$(CONFIG_EFI_LOADER) += efi_loader/ obj-$(CONFIG_EFI_LOADER) += efi_loader/
obj-$(CONFIG_CMD_BOOTEFI_SELFTEST) += efi_selftest/ obj-$(CONFIG_CMD_BOOTEFI_SELFTEST) += efi_selftest/

4
lib/efi_client/Kconfig
View File

@@ -1,7 +1,7 @@
menu "U-Boot as UEFI application" menu "U-Boot as UEFI application"
depends on X86 || ARM depends on X86 || ARM
config EFI config EFI_CLIENT
bool "Support running U-Boot from EFI" bool "Support running U-Boot from EFI"
depends on X86 || ARM depends on X86 || ARM
imply X86_TSC_READ_BASE imply X86_TSC_READ_BASE
@@ -13,7 +13,7 @@ config EFI
choice choice
prompt "Select EFI mode to use" prompt "Select EFI mode to use"
depends on EFI depends on EFI_CLIENT
config EFI_APP config EFI_APP
bool "Support running as an EFI application" bool "Support running as an EFI application"

4
lib/uuid.c
View File

@@ -82,7 +82,7 @@ static const struct {
{"cros-fw", PARTITION_CROS_FIRMWARE}, {"cros-fw", PARTITION_CROS_FIRMWARE},
{"cros-rsrv", PARTITION_CROS_RESERVED}, {"cros-rsrv", PARTITION_CROS_RESERVED},
#endif #endif
#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI) #if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI_CLIENT)
{ {
"Device Path", "Device Path",
EFI_DEVICE_PATH_PROTOCOL_GUID, EFI_DEVICE_PATH_PROTOCOL_GUID,
@@ -269,7 +269,7 @@ static const struct {
EFI_CERT_TYPE_PKCS7_GUID, EFI_CERT_TYPE_PKCS7_GUID,
}, },
#endif #endif
#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI) #if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI_CLIENT)
{ "EFI_LZMA_COMPRESSED", EFI_LZMA_COMPRESSED }, { "EFI_LZMA_COMPRESSED", EFI_LZMA_COMPRESSED },
{ "EFI_DXE_SERVICES", EFI_DXE_SERVICES }, { "EFI_DXE_SERVICES", EFI_DXE_SERVICES },
{ "EFI_HOB_LIST", EFI_HOB_LIST }, { "EFI_HOB_LIST", EFI_HOB_LIST },