diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | doc/develop/uefi/u-boot_on_efi.rst | 8 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/efi_client/Kconfig (renamed from lib/efi/Kconfig) | 0 | ||||
| -rw-r--r-- | lib/efi_client/Makefile (renamed from lib/efi/Makefile) | 0 | ||||
| -rw-r--r-- | lib/efi_client/efi.c (renamed from lib/efi/efi.c) | 0 | ||||
| -rw-r--r-- | lib/efi_client/efi_app.c (renamed from lib/efi/efi_app.c) | 0 | ||||
| -rw-r--r-- | lib/efi_client/efi_app_init.c (renamed from lib/efi/efi_app_init.c) | 0 | ||||
| -rw-r--r-- | lib/efi_client/efi_info.c (renamed from lib/efi/efi_info.c) | 0 | ||||
| -rw-r--r-- | lib/efi_client/efi_stub.c (renamed from lib/efi/efi_stub.c) | 0 | ||||
| -rw-r--r-- | lib/efi_loader/Kconfig | 2 |
12 files changed, 8 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d490b43c57f..3e555596a1c 100644 --- 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 @@ -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 245b4af1fa3..42e84c13049 100644 --- 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 18ae0cd87bf..1dd738a7cd1 100644 --- 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 index 81ed3e66b34..81ed3e66b34 100644 --- a/lib/efi/Kconfig +++ b/lib/efi_client/Kconfig diff --git a/lib/efi/Makefile b/lib/efi_client/Makefile index 232fa684360..232fa684360 100644 --- a/lib/efi/Makefile +++ b/lib/efi_client/Makefile diff --git a/lib/efi/efi.c b/lib/efi_client/efi.c index bcb34d67465..bcb34d67465 100644 --- a/lib/efi/efi.c +++ b/lib/efi_client/efi.c diff --git a/lib/efi/efi_app.c b/lib/efi_client/efi_app.c index 9b94a93ee4f..9b94a93ee4f 100644 --- a/lib/efi/efi_app.c +++ b/lib/efi_client/efi_app.c diff --git a/lib/efi/efi_app_init.c b/lib/efi_client/efi_app_init.c index c5e4192fe06..c5e4192fe06 100644 --- a/lib/efi/efi_app_init.c +++ b/lib/efi_client/efi_app_init.c diff --git a/lib/efi/efi_info.c b/lib/efi_client/efi_info.c index 5b564c5651d..5b564c5651d 100644 --- a/lib/efi/efi_info.c +++ b/lib/efi_client/efi_info.c diff --git a/lib/efi/efi_stub.c b/lib/efi_client/efi_stub.c index a083c7f1e9b..a083c7f1e9b 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi_client/efi_stub.c diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 077466f01f0..250b9469134 100644 --- 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 |