efi: Rename the lib/efi directory

This directory was created when U-Boot gained the ability to run as an
EFI app in 2015. Since then the EFI-loader feature has been added.

The code in lib/efi is not actually used by the loader, so the name is
confusing.

Rename the directory to efi_client to indicate that it includes files
just for U-Boot being a client of EFI, i.e. the EFI app and stub.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index d490b43c57f72f928e326cb1d7981aa4358a3c1c..3e555596a1cc16c70f8e5953b729d5c3178fe416 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1104,7 +1104,7 @@ F:        configs/efi-x86_app*
 F:     doc/develop/uefi/u-boot_on_efi.rst
 F:     drivers/block/efi-media-uclass.c
 F:     drivers/block/sb_efi_media.c
-F:     lib/efi/efi_app.c
+F:     lib/efi_client/
 F:     scripts/build-efi.sh
 F:     test/dm/efi_media.c
 

diff --git a/Makefile b/Makefile
index 6a0251373c42d8517dbe6d1f5a7b189e19bcd26e..9c22b510333c51bf5715bfa8977421de537337d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1891,7 +1891,7 @@ u-boot-payload.lds: $(LDSCRIPT_EFI) FORCE
 quiet_cmd_u-boot_payload ?= LD      $@
       cmd_u-boot_payload ?= $(LD) $(LDFLAGS_EFI_PAYLOAD) -o $@ \
       -T u-boot-payload.lds arch/x86/cpu/call32.o \
-      lib/efi/efi.o lib/efi/efi_stub.o u-boot.bin.o \
+      lib/efi_client/efi.o lib/efi_client/efi_stub.o u-boot.bin.o \
       $(addprefix arch/$(ARCH)/lib/,$(EFISTUB))
 
 u-boot-payload: u-boot.bin.o u-boot-payload.lds FORCE

diff --git a/doc/develop/uefi/u-boot_on_efi.rst b/doc/develop/uefi/u-boot_on_efi.rst
index 245b4af1fa3540fbbe9beb0a2e2a91396f8df170..42e84c13049e4ae53eddca0b172e51f562bd9347 100644 (file)
--- a/doc/develop/uefi/u-boot_on_efi.rst
+++ b/doc/develop/uefi/u-boot_on_efi.rst
@@ -113,7 +113,7 @@ implemented completely differently.
 EFI Application
 ~~~~~~~~~~~~~~~
 For the application the whole of U-Boot is built as a shared library. The
-efi_main() function is in lib/efi/efi_app.c. It sets up some basic EFI
+efi_main() function is in lib/efi_client/efi_app.c. It sets up some basic EFI
 functions with efi_init(), sets up U-Boot global_data, allocates memory for
 U-Boot's malloc(), etc. and enters the normal init sequence (board_init_f()
 and board_init_r()).
@@ -149,7 +149,7 @@ image (including device tree) into a small EFI stub application responsible
 for booting it. The stub application is built as a normal EFI application
 except that it has a lot of data attached to it.
 
-The stub application is implemented in lib/efi/efi_stub.c. The efi_main()
+The stub application is implemented in lib/efi_client/efi_stub.c. The efi_main()
 function is called by EFI. It is responsible for copying U-Boot from its
 original location into memory, disabling EFI boot services and starting
 U-Boot. U-Boot then starts as normal, relocates, starts all drivers, etc.
@@ -192,7 +192,7 @@ careful to build the correct one so that your UEFI firmware can start it. Most
 UEFI images are 64-bit at present.
 
 The payload stub can be build as either 32- or 64-bits. Only a small amount
-of code is built this way (see the extra- line in lib/efi/Makefile).
+of code is built this way (see the extra- line in lib/efi_client/Makefile).
 Everything else is built as a normal U-Boot, so is always 32-bit on x86 at
 present.
 
@@ -353,7 +353,7 @@ This work could be extended in a number of ways:
 
 Where is the code?
 ------------------
-lib/efi
+lib/efi_client
        payload stub, application, support code. Mostly arch-neutral
 
 arch/x86/cpu/efi

diff --git a/lib/Makefile b/lib/Makefile
index 18ae0cd87bfcce6b8cd3729f8e2513862b8c3324..1dd738a7cd15acbfb3e12325b713b9005760cc31 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -5,7 +5,7 @@
 
 ifndef CONFIG_XPL_BUILD
 
-obj-$(CONFIG_EFI) += efi/
+obj-$(CONFIG_EFI) += 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/Kconfig b/lib/efi_client/Kconfig
similarity index 100%
rename from lib/efi/Kconfig
rename to lib/efi_client/Kconfig

diff --git a/lib/efi/Makefile b/lib/efi_client/Makefile
similarity index 100%
rename from lib/efi/Makefile
rename to lib/efi_client/Makefile

diff --git a/lib/efi/efi.c b/lib/efi_client/efi.c
similarity index 100%
rename from lib/efi/efi.c
rename to lib/efi_client/efi.c

diff --git a/lib/efi/efi_app.c b/lib/efi_client/efi_app.c
similarity index 100%
rename from lib/efi/efi_app.c
rename to lib/efi_client/efi_app.c

diff --git a/lib/efi/efi_app_init.c b/lib/efi_client/efi_app_init.c
similarity index 100%
rename from lib/efi/efi_app_init.c
rename to lib/efi_client/efi_app_init.c

diff --git a/lib/efi/efi_info.c b/lib/efi_client/efi_info.c
similarity index 100%
rename from lib/efi/efi_info.c
rename to lib/efi_client/efi_info.c

diff --git a/lib/efi/efi_stub.c b/lib/efi_client/efi_stub.c
similarity index 100%
rename from lib/efi/efi_stub.c
rename to lib/efi_client/efi_stub.c

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 077466f01f002fa9e20600ce7d0722ca13c36122..250b94691345bc57bdc3aa3462654993d6e12fc8 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -595,6 +595,6 @@ config BOOTEFI_TESTAPP_COMPILE
 
 endif
 
-source "lib/efi/Kconfig"
+source "lib/efi_client/Kconfig"
 
 endmenu