Merge tag 'u-boot-amlogic-20230417' of https://source.denx.de/u-boot/custodians/u...

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

diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h
index ba67c98..d8ef250 100644 (file)
--- a/include/configs/am62ax_evm.h
+++ b/include/configs/am62ax_evm.h
@@ -59,19 +59,24 @@
        EXTRA_ENV_AM62A7_BOARD_SETTINGS_MMC                             \
        "bootcmd_ti_mmc="                                               \
                "run findfdt; run envboot; run init_mmc;"               \
-               "run get_kern_mmc; run get_fdt_mmc;"                    \
-               "run get_overlay_mmc;"                                  \
-               "run run_kern;\0"
+               "if test ${boot_fit} -eq 1; then;"                      \
+                       "run get_fit_mmc; run get_overlaystring;"       \
+                       "run run_fit;"                                  \
+               "else;"                                                 \
+                       "run get_kern_mmc; run get_fdt_mmc;"            \
+                       "run get_overlay_mmc;"                          \
+                       "run run_kern;"                                 \
+               "fi;\0"
 
 #define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance)           \
        "ti_mmc "
 
-#if CONFIG_IS_ENABLED(CMD_MMC)
+#if IS_ENABLED(CONFIG_CMD_MMC)
        #define BOOT_TARGET_MMC(func)                                   \
                func(TI_MMC, ti_mmc, na)
 #else
        #define BOOT_TARGET_MMC(func)
-#endif /* CONFIG_IS_ENABLED(CMD_MMC) */
+#endif /* IS_ENABLED(CONFIG_CMD_MMC) */
 
 #define BOOT_TARGET_DEVICES(func)                                      \
        BOOT_TARGET_MMC(func)
@@ -80,9 +85,6 @@
 
 /* Incorporate settings into the U-Boot environment */
 #define CFG_EXTRA_ENV_SETTINGS                                 \
-       DEFAULT_LINUX_BOOT_ENV                                          \
-       DEFAULT_FIT_TI_ARGS                                             \
-       EXTRA_ENV_AM62A7_BOARD_SETTINGS                                 \
        BOOTENV
 
 /* Now for the remaining common defines */