karo: tx6: rename CONFIG_SYS_BOOT_CMD_NAND to FDTSAVE_CMD_STR

[karo-tx-uboot.git] / include / configs / tx6.h

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 06e6f630f090b143b7a173957d4c61d1a5fc1865..71a3d71b2b98808c6be329421c14e721591aae9d 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -51,10 +51,17 @@
 #ifndef CONFIG_SOC_MX6UL
 #define CONFIG_VIDEO_IPUV3
 #define CONFIG_IPUV3_CLK               (CONFIG_SYS_SDRAM_CLK * 1000000 / 2)
-#endif
+#else
+#define CONFIG_VIDEO_MXS
+#define MXS_LCDIF_BASE                 0x021c8000UL
+#endif /* CONFIG_SOC_MX6UL */
 #define CONFIG_LCD_LOGO
 #define LCD_BPP                                LCD_COLOR32
 #define CONFIG_CMD_BMP
+#define CONFIG_BMP_8BPP
+#define CONFIG_BMP_16BPP
+#define CONFIG_BMP_24BPP
+#define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
 #endif /* CONFIG_TX6_UBOOT_MFG */
@@ -208,7 +215,7 @@
        EMMC_BOOT_PART_STR                                              \
        EMMC_BOOT_ACK_STR                                               \
        "fdtaddr=" xstr(CONFIG_FDTADDR) "\0"                            \
-       CONFIG_SYS_FDTSAVE_CMD                                          \
+       FDTSAVE_CMD_STR                                                 \
        "mtdids=" MTDIDS_DEFAULT "\0"                                   \
        "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
        "nfsroot=/tftpboot/rootfs\0"                                    \
@@ -222,7 +229,7 @@
 #define CONFIG_SYS_DEFAULT_BOOT_MODE   "nand"
 #define CONFIG_SYS_BOOT_CMD_NAND                                       \
        "bootcmd_nand=setenv autostart no;run bootargs_ubifs;nboot linux\0"
-#define CONFIG_SYS_FDTSAVE_CMD                                         \
+#define FDTSAVE_CMD_STR                                                        \
        "fdtsave=fdt resize;nand erase.part dtb"                        \
        ";nand write ${fdtaddr} dtb ${fdtsize}\0"
 #define MTD_NAME                       "gpmi-nand"
@@ -236,7 +243,7 @@
 #define CONFIG_SYS_DEFAULT_BOOT_MODE   "mmc"
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1
 #define CONFIG_SYS_BOOT_CMD_NAND       ""
-#define CONFIG_SYS_FDTSAVE_CMD                                         \
+#define FDTSAVE_CMD_STR                                                        \
        "fdtsave=mmc partconf 0 ${emmc_boot_ack} ${emmc_boot_part} ${emmc_boot_part}" \
        ";mmc write ${fdtaddr} " xstr(CONFIG_SYS_DTB_BLKNO) " 80"       \
        ";mmc partconf 0 ${emmc_boot_ack} ${emmc_boot_part} 0\0"
@@ -274,6 +281,8 @@
 #ifndef CONFIG_SOC_MX6UL
 #define CONFIG_FEC_MXC_PHYADDR         0
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
+#else
+#define FEC_MDIO_BASE_ADDR             ENET_BASE_ADDR
 #endif
 #define CONFIG_FEC_XCV_TYPE            RMII
 #endif
@@ -284,26 +293,31 @@
 #ifdef CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_SPEED           400000
+#endif /* CONFIG_HARD_I2C */
 #if defined(CONFIG_TX6_REV)
 #if CONFIG_TX6_REV == 0x1
-#define CONFIG_SYS_I2C_SLAVE           0x3c
 #define CONFIG_LTC3676
 #elif CONFIG_TX6_REV == 0x2
-#define CONFIG_SYS_I2C_SLAVE           0x32
 #define CONFIG_RN5T618
 #elif CONFIG_TX6_REV == 0x3
-#define CONFIG_SYS_I2C_SLAVE           0x33
 #define CONFIG_RN5T567
 #else
 #error Unsupported TX6 module revision
 #endif
-#endif /* CONFIG_TX6_REV */
+#else /* CONFIG_TX6_REV */
 /* autodetect which PMIC is present to derive TX6_REV */
-#ifndef CONFIG_SOC_MX6UL
+#ifdef CONFIG_SOC_MX6UL
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT
+#define CONFIG_SYS_I2C_SOFT_SPEED      400000
+#define CONFIG_SOFT_I2C_GPIO_SCL       IMX_GPIO_NR(5, 0)
+#define CONFIG_SOFT_I2C_GPIO_SDA       IMX_GPIO_NR(5, 1)
+#define CONFIG_SOFT_I2C_READ_REPEATED_START
+#else
 #define CONFIG_LTC3676                 /* TX6_REV == 1 */
 #endif
 #define CONFIG_RN5T567                 /* TX6_REV == 3 */
-#endif /* CONFIG_HARD_I2C */
+#endif /* CONFIG_TX6_REV */
 
 #define CONFIG_ENV_OVERWRITE