Convert CONFIG_ENV_IS_IN_FAT 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 81da8ff9e634cbe0cb6060a9273b5885dedbeb2c..b0b420645ec4c039e71f4d6cf8949ef7edf2d79f 100644 (file)
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -10,9 +10,14 @@
 #ifndef __CONFIG_K2G_EVM_H
 #define __CONFIG_K2G_EVM_H
 
+#include <environment/ti/mmc.h>
+#include <environment/ti/spi.h>
+
 /* Platform type */
 #define CONFIG_SOC_K2G
 
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 /* U-Boot general configuration */
 #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS                            \
        DEFAULT_MMC_TI_ARGS                                             \
@@ -25,7 +30,14 @@
        "rd_spec=-\0"                                                   \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=ubifs,2048\0"       \
-       "name_fdt=keystone-k2g-evm.dtb\0"                               \
+       "findfdt="\
+               "if test $board_name = 66AK2GGP; then " \
+                        "setenv name_fdt keystone-k2g-evm.dtb; " \
+               "else if test $board_name = 66AK2GIC; then " \
+                        "setenv name_fdt keystone-k2g-ice.dtb; " \
+               "else if test $name_fdt = undefined; then " \
+                       "echo WARNING: Could not determine device tree to use;"\
+               "fi;fi;fi;\0" \
        "name_mon=skern-k2g.bin\0"                                      \
        "name_ubi=k2g-evm-ubifs.ubi\0"                                  \
        "name_uboot=u-boot-spi-k2g-evm.gph\0"                           \
@@ -43,9 +55,7 @@
        "run envboot; "                                                 \
        "run set_name_pmmc init_${boot} init_fw_rd_${boot} "            \
        "get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon "            \
-       "get_fdt_${boot} get_kern_${boot} run_kern"
-
-#include <configs/ti_armv7_keystone2.h>
+       "findfdt get_fdt_${boot} get_kern_${boot} run_kern"
 
 /* SPL SPI Loader Configuration */
 #define CONFIG_SPL_TEXT_BASE           0x0c080000
@@ -60,11 +70,7 @@
 #define CONFIG_PHY_MICREL
 #define PHY_ANEG_TIMEOUT       10000 /* PHY needs longer aneg time */
 
-/* MMC/SD */
-#define CONFIG_GENERIC_MMC
-
-#undef CONFIG_ENV_IS_IN_NAND
-#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"
@@ -79,4 +85,8 @@
 #define CONFIG_BOUNCE_BUFFER
 #endif
 
+#define SPI_MTD_PARTS  KEYSTONE_SPI1_MTD_PARTS
+
+#include <configs/ti_armv7_keystone2.h>
+
 #endif /* __CONFIG_K2G_EVM_H */