On 23.05.25 15:06, Simon Glass wrote:
Some functions provided in lib/efi_loader are actually useful for the
app as well. This series refactors the Kconfig and directories a little
so that code is easier to share.

As a starting point, it moves some filename and device-path functions to
the new directory.

The next step would be to move device-path code over, but this will need
some discussion.

Hello Simon,

Overall the ideas in this series look fine to me. But this series does not apply to origin/next.

Applying: efi_loader: Separate device path into its own header
Patch failed at 0001 efi_loader: Separate device path into its own header
error: patch failed: cmd/efidebug.c:8
error: cmd/efidebug.c: patch does not apply
error: patch failed: include/efi_loader.h:967
error: include/efi_loader.h: patch does not apply
error: patch failed: lib/efi_loader/efi_bootmgr.c:12
error: lib/efi_loader/efi_bootmgr.c: patch does not apply
error: patch failed: lib/efi_loader/efi_device_path.c:10
error: lib/efi_loader/efi_device_path.c: patch does not apply
error: patch failed: lib/efi_loader/efi_helper.c:6
error: lib/efi_loader/efi_helper.c: patch does not apply

Please, resend the series based on origin/next.

Patches that are not based on upstream U-Boot cannot be reviewed via this mailing list.

Best regards

Heinrich



Simon Glass (10):
   efi_loader: Separate device path into its own header
   efi: Include device-path functions in the EFI API docs
   efi: Rename END to EFI_DP_END
   efi: Rename the lib/efi directory
   efi: Rename CONFIG_EFI to CONFIG_EFI_CLIENT
   efi: Create a new CONFIG_EFI
   efi: Update maintainers for EFI_CLIENT
   efi: Move the base name and PXE info into lib/efi
   efi: Adjust copyright and mention constant source
   efi: Move FDT-filename discovery into lib/efi

  MAINTAINERS                                |   5 +-
  Makefile                                   |   4 +-
  arch/arm/include/asm/global_data.h         |   2 +-
  arch/x86/Kconfig                           |   6 +-
  arch/x86/cpu/Makefile                      |   2 +-
  arch/x86/cpu/efi/Kconfig                   |   2 +-
  arch/x86/cpu/x86_64/Makefile               |   2 +-
  cmd/Makefile                               |   2 +-
  cmd/bootefi.c                              |   1 +
  cmd/eficonfig.c                            |   5 +-
  cmd/efidebug.c                             |   7 +-
  cmd/part_find.c                            |  10 +-
  configs/efi-arm_app64_defconfig            |   2 +-
  configs/efi-x86_app32_defconfig            |   2 +-
  configs/efi-x86_app64_defconfig            |   2 +-
  configs/efi-x86_payload32_defconfig        |   2 +-
  configs/efi-x86_payload64_defconfig        |   2 +-
  doc/api/efi.rst                            |   6 +
  doc/develop/uefi/u-boot_on_efi.rst         |  18 +-
  drivers/block/Kconfig                      |   2 +-
  include/efi_device_path.h                  | 420 +++++++++++++++++++++
  include/efi_loader.h                       |  57 +--
  include/init.h                             |   2 +-
  lib/Kconfig                                |   2 +-
  lib/Makefile                               |   1 +
  lib/efi/Kconfig                            |  86 +----
  lib/efi/Makefile                           |  28 +-
  lib/efi/basename.c                         | 153 ++++++++
  lib/efi_client/Kconfig                     |  83 ++++
  lib/efi_client/Makefile                    |  28 ++
  lib/{efi => efi_client}/efi.c              |   0
  lib/{efi => efi_client}/efi_app.c          |   0
  lib/{efi => efi_client}/efi_app_init.c     |   0
  lib/{efi => efi_client}/efi_dtb.S          |   0
  lib/{efi => efi_client}/efi_info.c         |   0
  lib/{efi => efi_client}/efi_stub_arm64.c   |   0
  lib/{efi => efi_client}/efi_stub_x86.c     |   0
  lib/{efi => efi_client}/efi_vars.c         |   0
  lib/{efi => efi_client}/sdram.c            |   0
  lib/efi_driver/efi_uclass.c                |   1 +
  lib/efi_loader/Kconfig                     |   3 +
  lib/efi_loader/efi_bootbin.c               |   1 +
  lib/efi_loader/efi_bootmgr.c               |   4 +-
  lib/efi_loader/efi_boottime.c              |   1 +
  lib/efi_loader/efi_capsule.c               |   1 +
  lib/efi_loader/efi_console.c               |   1 +
  lib/efi_loader/efi_device_path.c           | 175 +++------
  lib/efi_loader/efi_device_path_utilities.c |   3 +-
  lib/efi_loader/efi_disk.c                  |   1 +
  lib/efi_loader/efi_fdt.c                   |  64 +---
  lib/efi_loader/efi_helper.c                |  81 +---
  lib/efi_loader/efi_net.c                   |   1 +
  lib/efi_loader/efi_tcg2.c                  |   1 +
  lib/uuid.c                                 |   4 +-
  test/lib/efi_device_path.c                 |   1 +
  55 files changed, 814 insertions(+), 473 deletions(-)
  create mode 100644 include/efi_device_path.h
  create mode 100644 lib/efi/basename.c
  create mode 100644 lib/efi_client/Kconfig
  create mode 100644 lib/efi_client/Makefile
  rename lib/{efi => efi_client}/efi.c (100%)
  rename lib/{efi => efi_client}/efi_app.c (100%)
  rename lib/{efi => efi_client}/efi_app_init.c (100%)
  rename lib/{efi => efi_client}/efi_dtb.S (100%)
  rename lib/{efi => efi_client}/efi_info.c (100%)
  rename lib/{efi => efi_client}/efi_stub_arm64.c (100%)
  rename lib/{efi => efi_client}/efi_stub_x86.c (100%)
  rename lib/{efi => efi_client}/efi_vars.c (100%)
  rename lib/{efi => efi_client}/sdram.c (100%)


Reply via email to