Akashi-san
On Mon, 4 Dec 2023 at 03:58, AKASHI Takahiro takahiro.akashi@linaro.org wrote:
Hi Heinrich, Ilias
On Tue, Nov 21, 2023 at 10:29:38AM +0900, AKASHI Takahiro wrote:
This patch set is motivated by the discussion[1] regarding CONFIG_BOOTEFI_BOOTMGR option.
At the end, bootefi.c will be decomposed into two parts, one for providing the command itself and one for implementing helper functions. EFI_LOADER will now be available without CONFIG_CMDLINE or specifically CONFIG_CMD_BOOTEFI if invoked via bootmeth/bootstd.
Then, EFI_LOADER library side will be further split into two options for fine-grain control: CONFIG_EFI_BINARY_EXEC: execute UEFI binaries which are to be explicitly loaded by U-Boot's load commands/functions or other methods (like a jtag debugger?) It supports bootmeth_efi as well as "bootefi <addr>|hello"(/"bootm"?).
CONFIG_EFI_BOOTMGR: provide EFI boot manger functionality It supports bootmeth_efi_mgr as well as "bootefi bootmgr".
As such, We will no longer need CONFIG_EFI_BINARY_EXEC if we want to only make use of the UEFI boot manger for booting a next stage OS.
Any other comments? I think the changes are no doubt trivial.
I had other patches down the queue, I'll have a look within the week!
Thanks /Ilias
-Takahiro Akashi
Prerequisite
This patch set is based on top of Tom's "next" branch.
Patches
Patch#1-#12: I hope that those commits show step-by-step refactoring without introducing degradation.
Tests
- run UT efi_selftest on sandbox locally
- run test_efi_bootmgr on sandbox locally
Unfortunately, I could not submit a pull request for CI test.
Changes
v2 (Nov 21, 2023)
- rebased onto Tom's next branch
- remove already merged commits
- revise commit messages
- add patch #5 which was split from ex-patch#5
RFC (Oct 26, 2023)
[1] https://lists.denx.de/pipermail/u-boot/2023-October/534598.html
AKASHI Takahiro (12): cmd: bootefi: unfold do_bootefi_image() cmd: bootefi: re-organize do_bootefi() cmd: bootefi: carve out EFI boot manager interface cmd: bootefi: carve out binary execution interface cmd: bootefi: localize global device paths for efi_selftest cmd: bootefi: move library interfaces under lib/efi_loader cmd: efidebug: ease efi configuration dependency bootmeth: use efi_loader interfaces instead of bootefi command efi_loader: split unrelated code from efi_bootmgr.c efi_loader: rename BOOTEFI_BOOTMGR to EFI_BOOTMGR net: tftp: remove explicit efi configuration dependency fs: remove explicit efi configuration dependency
boot/Kconfig | 4 +- boot/Makefile | 2 +- boot/bootm_os.c | 31 +- boot/bootmeth_efi.c | 8 +- boot/bootmeth_efi_mgr.c | 2 +- cmd/Kconfig | 21 +- cmd/bootefi.c | 670 +++++-------------------------- cmd/efidebug.c | 4 +- fs/fs.c | 7 +- include/efi_loader.h | 34 +- lib/efi_loader/Kconfig | 11 +- lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_bootmgr.c | 37 ++ lib/efi_loader/efi_device_path.c | 3 +- lib/efi_loader/efi_helper.c | 498 ++++++++++++++++++++++- net/tftp.c | 10 +- test/boot/bootflow.c | 2 +- 17 files changed, 700 insertions(+), 646 deletions(-)
-- 2.34.1