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 /test | |
| parent | 106332d6cc583c4339e07020989d09b567900a59 (diff) | |
| parent | 21c856797e2735fbd4e8b900803e6c42eae8d434 (diff) | |
| download | u-boot-bdaa0b27b3b384a8dbe2dc9d48ce870b0854d6ec.zip u-boot-bdaa0b27b3b384a8dbe2dc9d48ce870b0854d6ec.tar.gz u-boot-bdaa0b27b3b384a8dbe2dc9d48ce870b0854d6ec.tar.bz2 | |
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 'test')
| -rw-r--r-- | test/boot/bootflow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 104f49d..fa54dde 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -374,7 +374,7 @@ static int bootflow_system(struct unit_test_state *uts) { struct udevice *bootstd, *dev; - if (!IS_ENABLED(CONFIG_BOOTEFI_BOOTMGR)) + if (!IS_ENABLED(CONFIG_EFI_BOOTMGR)) return -EAGAIN; ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd)); ut_assertok(device_bind(bootstd, DM_DRIVER_GET(bootmeth_efi_mgr), |