Kconfig: Move CONFIG_FIT and related options to Kconfig

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

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 14985f859d879e9a78b037bc13a4f6b832bd4b1f..33ac955e336e890ab3342e8ee0a425f764e6d0f4 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -18,10 +18,9 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F
 
-#define CONFIG_SYS_PROMPT              "Matrix U-Boot> "
 #define CONFIG_SYS_HZ                  1000
 
-#define CONFIG_IMX6_THERMAL
+#define CONFIG_IMX_THERMAL
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
@@ -62,7 +61,6 @@
 
 /* Filesystems / image support */
 #define CONFIG_EFI_PARTITION
-#define CONFIG_FIT
 
 /* MMC */
 #define CONFIG_SYS_FSL_USDHC_NUM       3
@@ -168,6 +166,8 @@
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_SYS_I2C_SPEED           100000
 #define CONFIG_I2C_EDID
@@ -175,8 +175,8 @@
 
 /* Environment organization */
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         2
-#define CONFIG_SYS_MMC_ENV_PART                1
+#define CONFIG_SYS_MMC_ENV_DEV         2 /* overwritten on SD boot */
+#define CONFIG_SYS_MMC_ENV_PART                1 /* overwritten on SD boot */
 #define CONFIG_ENV_SIZE                        (8 * 1024)
 #define CONFIG_ENV_OFFSET              (384 * 1024)
 #define CONFIG_ENV_OVERWRITE
@@ -191,7 +191,7 @@
        "bootargs_upd=setenv bootargs console=ttymxc0,115200 " \
                        "rdinit=/sbin/init enable_wait_mode=off\0" \
        "bootcmd_mmc=run bootargs_mmc; mmc dev 2; " \
-                       "mmc read 0x10800000 0x800 0x4000; bootm\0" \
+                       "mmc read 0x10800000 0x800 0x4000; bootm 0x10800000\0" \
        "bootcmd_up1=load mmc 1 0x10800000 uImage\0" \
        "bootcmd_up2=load mmc 1 0x10d00000 uramdisk.img; " \
                        "run bootargs_upd; " \