env: Migrate CONFIG_ENV_IS_IN_FAT options to Kconfig

[people/ms/u-boot.git] / include / configs / k2g_evm.h

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 5bf630e7f21e75c17d72e85f8b539e97784417e1..7a201b03614897d2afbb11355e2340be0d6c4d95 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -23,6 +23,7 @@
        DEFAULT_MMC_TI_ARGS                                             \
        DEFAULT_PMMC_BOOT_ENV                                           \
        DEFAULT_FW_INITRAMFS_BOOT_ENV                                   \
+       DEFAULT_FIT_TI_ARGS                                             \
        "boot=mmc\0"                                                    \
        "console=ttyS0,115200n8\0"                                      \
        "bootpart=0:2\0"                                                \
@@ -51,11 +52,27 @@
        "get_mon_mmc=load mmc ${bootpart} ${addr_mon} ${bootdir}/${name_mon}\0"\
        "name_fs=arago-base-tisdk-image-k2g-evm.cpio\0"
 
+#ifndef CONFIG_TI_SECURE_DEVICE
 #define CONFIG_BOOTCOMMAND                                             \
+       "run findfdt; "                                                 \
        "run envboot; "                                                 \
-       "run set_name_pmmc init_${boot} init_fw_rd_${boot} "            \
-       "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon "            \
-       "findfdt get_fdt_${boot} get_kern_${boot} run_kern"
+       "run init_${boot}; "                                            \
+       "run get_mon_${boot} run_mon; "                                 \
+       "run set_name_pmmc get_pmmc_${boot} run_pmmc; "                 \
+       "run get_kern_${boot}; "                                        \
+       "run init_fw_rd_${boot}; "                                      \
+       "run get_fdt_${boot}; "                                         \
+       "run run_kern"
+#else
+#define CONFIG_BOOTCOMMAND                                             \
+       "run findfdt; "                                                 \
+       "run envboot; "                                                 \
+       "run run_mon_hs; "                                              \
+       "run init_${boot}; "                                            \
+       "run set_name_pmmc get_pmmc_${boot} run_pmmc; "                 \
+       "run get_fit_${boot}; "                                         \
+       "bootm ${fit_loadaddr}#${name_fdt}"
+#endif
 
 /* SPL SPI Loader Configuration */
 #define CONFIG_SPL_TEXT_BASE           0x0c080000
@@ -70,11 +87,7 @@
 #define CONFIG_PHY_MICREL
 #define PHY_ANEG_TIMEOUT       10000 /* PHY needs longer aneg time */
 
-#define CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_SIZE                        (256 << 10)  /* 256 KiB */
-#define FAT_ENV_INTERFACE              "mmc"
-#define FAT_ENV_DEVICE_AND_PART                "0:1"
-#define FAT_ENV_FILE                   "uboot.env"
 
 #define CONFIG_SF_DEFAULT_BUS          1
 #define CONFIG_SF_DEFAULT_CS           0