diff options
| author | Tom Rini <trini@konsulko.com> | 2024-01-17 09:27:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-01-17 09:27:23 -0500 |
| commit | bdaa0b27b3b384a8dbe2dc9d48ce870b0854d6ec (patch) | |
| tree | 13cfd6369c9f16f11903a0c80c53047904307cd4 /cmd/efidebug.c | |
| parent | 106332d6cc583c4339e07020989d09b567900a59 (diff) | |
| parent | 21c856797e2735fbd4e8b900803e6c42eae8d434 (diff) | |
Merge tag 'efi-2024-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Documentation:
* add generated index to table of contents
* create index entries for commands
* update Python packages used to build the documentation
* fix typos in dfu documentation
UEFI:
* split unrelated code from efi_bootmgr.c
* rename CONFIG_BOOTEFI_BOOTMGR to CONFIG_EFI_BOOTMGR
* net: tftp: remove explicit EFI configuration dependency
* fs: remove explicit EFI configuration dependency
Other:
* Add Goldfish RTC driver and make it available on RISC-V QEMU
Diffstat (limited to 'cmd/efidebug.c')
| -rw-r--r-- | cmd/efidebug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/efidebug.c b/cmd/efidebug.c index aa8523797ef..a3a7556ea4a 100644 --- a/cmd/efidebug.c +++ b/cmd/efidebug.c @@ -1414,7 +1414,7 @@ static __maybe_unused int do_efi_test_bootmgr(struct cmd_tbl *cmdtp, int flag, } static struct cmd_tbl cmd_efidebug_test_sub[] = { -#ifdef CONFIG_BOOTEFI_BOOTMGR +#ifdef CONFIG_EFI_BOOTMGR U_BOOT_CMD_MKENT(bootmgr, CONFIG_SYS_MAXARGS, 1, do_efi_test_bootmgr, "", ""), #endif @@ -1608,7 +1608,7 @@ U_BOOT_LONGHELP(efidebug, " - show UEFI memory map\n" "efidebug tables\n" " - show UEFI configuration tables\n" -#ifdef CONFIG_BOOTEFI_BOOTMGR +#ifdef CONFIG_EFI_BOOTMGR "efidebug test bootmgr\n" " - run simple bootmgr for test\n" #endif |