efi: Rename CONFIG_EFI to CONFIG_EFI_CLIENT

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>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6ca0605466fa6e375f00d7f7feb7cd68ee738a1e..5aa134b6bcbed30b2515f586dd6e8ed4088d98c0 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -368,7 +368,7 @@ config USE_HOB
 
 config HAVE_FSP
        bool "Add an Firmware Support Package binary"
-       depends on !EFI
+       depends on !EFI_CLIENT
        select USE_HOB
        select HAS_ROM
        help
@@ -517,7 +517,7 @@ config FSP_BROKEN_HOB
 
 config ENABLE_MRC_CACHE
        bool "Enable MRC cache"
-       depends on !EFI && !SYS_COREBOOT
+       depends on !EFI_CLIENT && !SYS_COREBOOT
        help
          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
@@ -756,7 +756,7 @@ config HAVE_P2SB
          devices.
 
 menu "System tables"
-       depends on !EFI && !SYS_COREBOOT
+       depends on !EFI_CLIENT && !SYS_COREBOOT
 
 config GENERATE_PIRQ_TABLE
        bool "Generate a PIRQ table"

diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile
index cc55c8fa39cdfaae8fed419d687603827a80a08c..5150edb833f54fadee6bafeb2704152a3aa88f7c 100644 (file)
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_INTEL_BRASWELL) += braswell/
 obj-$(CONFIG_INTEL_BROADWELL) += broadwell/
 obj-$(CONFIG_SYS_COREBOOT) += coreboot/
 obj-$(CONFIG_SYS_SLIMBOOTLOADER) += slimbootloader/
-obj-$(CONFIG_EFI) += efi/
+obj-$(CONFIG_EFI_CLIENT) += efi/
 obj-$(CONFIG_QEMU) += qemu/
 obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/
 obj-$(CONFIG_INTEL_QUARK) += quark/

diff --git a/arch/x86/cpu/efi/Kconfig b/arch/x86/cpu/efi/Kconfig
index e0975d34d36e599e61f6b1c1cf5a2043a2d62c88..f5288013a8acc866147e75118d25b77ef278009c 100644 (file)
--- a/arch/x86/cpu/efi/Kconfig
+++ b/arch/x86/cpu/efi/Kconfig
@@ -1,4 +1,4 @@
-if EFI
+if EFI_CLIENT
 
 config SYS_CAR_ADDR
        hex

diff --git a/arch/x86/cpu/x86_64/Makefile b/arch/x86/cpu/x86_64/Makefile
index e929563b2c11a81424a67bcef24c55bf8f7419e1..cb23c071aa38f025ab15a51d7e650394020e93f6 100644 (file)
--- a/arch/x86/cpu/x86_64/Makefile
+++ b/arch/x86/cpu/x86_64/Makefile
@@ -5,6 +5,6 @@
 
 obj-y += cpu.o interrupts.o setjmp.o
 
-ifndef CONFIG_EFI
+ifndef CONFIG_EFI_CLIENT
 obj-y += misc.o
 endif

diff --git a/cmd/Makefile b/cmd/Makefile
index e4ecf2e049372c17e3d3924bf8050d3c4ba0d3c6..12e948fd1b94ba170b2de4f65229c0de34f7e68d 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -67,7 +67,7 @@ obj-$(CONFIG_CMD_EXTENSION) += extension_board.o
 obj-$(CONFIG_CMD_ECHO) += echo.o
 obj-$(CONFIG_ENV_IS_IN_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_EFICONFIG) += eficonfig.o
 ifdef CONFIG_CMD_EFICONFIG

diff --git a/configs/efi-x86_app32_defconfig b/configs/efi-x86_app32_defconfig
index 71d1bbd956e1c358767a04decb2b57d664a3a526..a06f1ccfe2a197e831697d98b810ce2029dd034c 100644 (file)
--- a/configs/efi-x86_app32_defconfig
+++ b/configs/efi-x86_app32_defconfig
@@ -7,7 +7,7 @@ CONFIG_DEBUG_UART_CLOCK=0
 CONFIG_VENDOR_EFI=y
 CONFIG_TARGET_EFI_APP32=y
 CONFIG_DEBUG_UART=y
-CONFIG_EFI=y
+CONFIG_EFI_CLIENT=y
 CONFIG_FIT=y
 # CONFIG_BOOTSTD is not set
 CONFIG_SHOW_BOOT_PROGRESS=y

diff --git a/configs/efi-x86_app64_defconfig b/configs/efi-x86_app64_defconfig
index 9f7b53d010684e3296747ad8d35db73e3228e6a8..9bcf5162b50443d897dc83517cd4c024d3b50457 100644 (file)
--- a/configs/efi-x86_app64_defconfig
+++ b/configs/efi-x86_app64_defconfig
@@ -8,7 +8,7 @@ CONFIG_X86_RUN_64BIT=y
 CONFIG_VENDOR_EFI=y
 CONFIG_TARGET_EFI_APP64=y
 CONFIG_DEBUG_UART=y
-CONFIG_EFI=y
+CONFIG_EFI_CLIENT=y
 CONFIG_EFI_APP_64BIT=y
 CONFIG_FIT=y
 # CONFIG_BOOTSTD is not set

diff --git a/configs/efi-x86_payload32_defconfig b/configs/efi-x86_payload32_defconfig
index e9c5ddf12ad3776b91713274659865c981be6944..ce9b7ff939d37020a2e2017d1838ac18f4c09fe9 100644 (file)
--- a/configs/efi-x86_payload32_defconfig
+++ b/configs/efi-x86_payload32_defconfig
@@ -5,7 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload"
 CONFIG_PRE_CON_BUF_ADDR=0x100000
 CONFIG_VENDOR_EFI=y
 CONFIG_TARGET_EFI_PAYLOAD=y
-CONFIG_EFI=y
+CONFIG_EFI_CLIENT=y
 CONFIG_EFI_STUB=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y

diff --git a/configs/efi-x86_payload64_defconfig b/configs/efi-x86_payload64_defconfig
index b82e10dc3a1161c91f9deb42c3fbf89278a4b2f8..6ce0018988610b6f8b9a1f5ab5ba2aade4d8f654 100644 (file)
--- a/configs/efi-x86_payload64_defconfig
+++ b/configs/efi-x86_payload64_defconfig
@@ -5,7 +5,7 @@ CONFIG_DEFAULT_DEVICE_TREE="efi-x86_payload"
 CONFIG_PRE_CON_BUF_ADDR=0x100000
 CONFIG_VENDOR_EFI=y
 CONFIG_TARGET_EFI_PAYLOAD=y
-CONFIG_EFI=y
+CONFIG_EFI_CLIENT=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_STUB_64BIT=y
 CONFIG_FIT=y

diff --git a/doc/develop/uefi/u-boot_on_efi.rst b/doc/develop/uefi/u-boot_on_efi.rst
index 42e84c13049e4ae53eddca0b172e51f562bd9347..9068894e40875cb837742bdf93f8e07fb03eac99 100644 (file)
--- a/doc/develop/uefi/u-boot_on_efi.rst
+++ b/doc/develop/uefi/u-boot_on_efi.rst
@@ -45,7 +45,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
 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
 U-Boot as normal, e.g.::
 
@@ -53,7 +53,7 @@ U-Boot as normal, e.g.::
    make
 
 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
 and efi-x86_payload32_defconfig) are set up for this. Then build U-Boot as
 normal, e.g.::
@@ -121,7 +121,7 @@ and board_init_r()).
 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
 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
 'boot services' to send and receive characters. Although it is implemented

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 750b0bd20820c712619dc411d6806d003dfd3077..c6c148ebd179ae947cf61cec815c859e7c941dbc 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -96,7 +96,7 @@ config TPL_BLOCK_CACHE
 
 config EFI_MEDIA
        bool "Support EFI media drivers"
-       default y if EFI || SANDBOX
+       default y if EFI_CLIENT || SANDBOX
        select BLK
        help
          Enable this to support media devices on top of UEFI. This enables

diff --git a/include/init.h b/include/init.h
index 2c10171359cf36b3baa0e015643459e14038e2d1..1e375da489360ee429ac79aacb12117a35bda02d 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -18,7 +18,7 @@
  * In case of the EFI app the UEFI firmware provides the low-level
  * initialisation.
  */
-#ifdef CONFIG_EFI
+#ifdef CONFIG_EFI_CLIENT
 #define ll_boot_init() false
 #else
 #include <asm/global_data.h>

diff --git a/lib/Kconfig b/lib/Kconfig
index 6a89f797beffe727907a07451d002e306fe87f5b..fbc9de90669aa70bee0b0d9bb30c68c26f3281e2 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1096,7 +1096,7 @@ config VPL_OF_LIBFDT_ASSUME_MASK
          unsafe execution. See FDT_ASSUME_PERFECT, etc. in libfdt_internal.h
 
 menu "System tables"
-       depends on (!EFI && !SYS_COREBOOT) || (ARM && EFI_LOADER)
+       depends on (!EFI_CLIENT && !SYS_COREBOOT) || (ARM && EFI_LOADER)
 
 config BLOBLIST_TABLES
        bool "Put tables in a bloblist"

diff --git a/lib/Makefile b/lib/Makefile
index 1dd738a7cd15acbfb3e12325b713b9005760cc31..2643bfc867cbe594db017329c16fa186ef6bddd5 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,7 +5,7 @@
 
 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_loader/
 obj-$(CONFIG_CMD_BOOTEFI_SELFTEST) += efi_selftest/

diff --git a/lib/efi_client/Kconfig b/lib/efi_client/Kconfig
index 81ed3e66b34d17c4b0cb53b5e9d371b08d1007f5..ec413639bfebd16a048113e6994dddbda5a9127f 100644 (file)
--- a/lib/efi_client/Kconfig
+++ b/lib/efi_client/Kconfig
@@ -1,7 +1,7 @@
 menu "U-Boot as UEFI application"
        depends on X86
 
-config EFI
+config EFI_CLIENT
        bool "Support running U-Boot from EFI"
        depends on X86
        imply X86_TSC_READ_BASE
@@ -13,7 +13,7 @@ config EFI
 
 choice
        prompt "Select EFI mode to use"
-       depends on X86 && EFI
+       depends on X86 && EFI_CLIENT
 
 config EFI_APP
        bool "Support running as an EFI application"

diff --git a/lib/uuid.c b/lib/uuid.c
index a1c88b9a62299eabd53636849b9174cfae948eeb..8d99b540d9fd747f0e6fc7c0a78b858e14250de0 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -94,7 +94,7 @@ static const struct {
                "system", "EFI System Partition",
                PARTITION_SYSTEM_GUID,
        },
-#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI)
+#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI_CLIENT)
        {
                NULL, "Device Path",
                PARTITION_SYSTEM_GUID,
@@ -281,7 +281,7 @@ static const struct {
                EFI_CERT_TYPE_PKCS7_GUID,
        },
 #endif
-#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI)
+#if defined(CONFIG_CMD_EFIDEBUG) || defined(CONFIG_EFI_CLIENT)
        { "EFI_LZMA_COMPRESSED", NULL, EFI_LZMA_COMPRESSED },
        { "EFI_DXE_SERVICES", NULL, EFI_DXE_SERVICES },
        { "EFI_HOB_LIST", NULL, EFI_HOB_LIST },