|
@@ -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 " \
|