Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / include / config_distro_bootcmd.h

diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 3570a32..82a3a36 100644 (file)
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -118,17 +118,21 @@
          "setenv efi_fdtfile ${soc}-${board}${boardver}.dtb; "           \
        "fi; "
 #else
+#ifndef BOOTENV_EFI_SET_FDTFILE_FALLBACK
 #define BOOTENV_EFI_SET_FDTFILE_FALLBACK
 #endif
+#endif
 
 
 #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 +156,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 "  \
@@ -189,6 +194,7 @@
                "fi\0" \
        \
        "nvme_boot=" \
+               BOOTENV_RUN_PCI_ENUM \
                BOOTENV_RUN_NVME_INIT \
                BOOTENV_SHARED_BLKDEV_BODY(nvme)
 #define BOOTENV_DEV_NVME       BOOTENV_DEV_BLKDEV