diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-06 08:36:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-06 08:36:38 -0400 |
| commit | 5dcf7cc590b348f1e730ec38242df64c179f10a8 (patch) | |
| tree | 7ba5948897352b913338be6cf27061570e96a128 /include | |
| parent | 987ab49366f3fcd25039eab431bf099b587b3265 (diff) | |
| parent | 4cbb2930bd8c67f40f848528941930cf4c2a1841 (diff) | |
| download | u-boot-5dcf7cc590b348f1e730ec38242df64c179f10a8.tar.gz | |
Merge tag 'efi-2021-01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-01-rc1
The following bugs in the UEFI system are resolved:
* illegal free in EFI_LOAD_FILE2_PROTOCOL implementation
* incorrect documentation of EFI_LOAD_FILE2_PROTOCOL implementation
* output of CRC32 as decimal instead hexadecimal in unit test
* use EfiReservedMemoryType for no-map reserved memory
* avoid unnecessary resets in UEFI unit tests
* call EFI bootmgr even without having /EFI/boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/config_distro_bootcmd.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index fc0935fa21..ff29ef5a90 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -123,12 +123,14 @@ #define BOOTENV_SHARED_EFI \ - "boot_efi_binary=" \ + "boot_efi_bootmgr=" \ "if fdt addr ${fdt_addr_r}; then " \ "bootefi bootmgr ${fdt_addr_r};" \ "else " \ - "bootefi bootmgr ${fdtcontroladdr};" \ - "fi;" \ + "bootefi bootmgr;" \ + "fi\0" \ + \ + "boot_efi_binary=" \ "load ${devtype} ${devnum}:${distro_bootpart} " \ "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \ "if fdt addr ${fdt_addr_r}; then " \ @@ -152,6 +154,7 @@ "run load_efi_dtb; " \ "fi;" \ "done;" \ + "run boot_efi_bootmgr;" \ "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ "efi/boot/"BOOTEFI_NAME"; then " \ "echo Found EFI removable media binary " \ |