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 cdd639b..d8ef250 100644 (file)
--- a/include/configs/am62ax_evm.h
+++ b/include/configs/am62ax_evm.h
@@ -71,12 +71,12 @@
 #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)
@@ -85,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 */