/*
* Memory configuration options
*/
-#define CONFIG_NR_DRAM_BANKS 1 /* # of SDRAM banks */
+#define CONFIG_NR_DRAM_BANKS 0x1 /* # of SDRAM banks */
#define PHYS_SDRAM_1 0x10000000 /* Base address of bank 1 */
#ifdef CONFIG_SYS_SDRAM_BUS_WIDTH
#define PHYS_SDRAM_1_WIDTH CONFIG_SYS_SDRAM_BUS_WIDTH
#else
#define PHYS_SDRAM_1_WIDTH 64
#endif
-#define PHYS_SDRAM_1_SIZE (SZ_512M * (PHYS_SDRAM_1_WIDTH / 32))
-
+#define PHYS_SDRAM_1_SIZE (SZ_512M / 32 * PHYS_SDRAM_1_WIDTH)
#ifdef CONFIG_MX6Q
#define CONFIG_SYS_SDRAM_CLK 528
#else
* U-Boot general configurations
*/
#define CONFIG_SYS_LONGHELP
-#ifdef CONFIG_MX6Q
+#if defined(CONFIG_MX6Q)
#define CONFIG_SYS_PROMPT "TX6Q U-Boot > "
-#else
+#elif defined(CONFIG_MX6DL)
#define CONFIG_SYS_PROMPT "TX6DL U-Boot > "
+#elif defined(CONFIG_MX6S)
+#define CONFIG_SYS_PROMPT "TX6S U-Boot > "
+#else
+#error Unsupported i.MX6 processor variant
#endif
#define CONFIG_SYS_CBSIZE 2048 /* Console I/O buffer size */
#define CONFIG_SYS_PBSIZE \
/*
* Flattened Device Tree (FDT) support
*/
-#ifndef CONFIG_MFG
#define CONFIG_OF_LIBFDT
#ifdef CONFIG_OF_LIBFDT
-#ifndef CONFIG_TX6_V2
+#ifndef CONFIG_NO_NAND
#define CONFIG_FDT_FIXUP_PARTITIONS
#endif
#define CONFIG_OF_BOARD_SETUP
#endif /* CONFIG_OF_LIBFDT */
-#endif /* CONFIG_MFG */
/*
* Boot Linux
#endif
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_AUTOLOAD "no"
-#ifndef CONFIG_MFG
#define CONFIG_BOOTFILE "uImage"
#define CONFIG_BOOTARGS "init=/linuxrc console=ttymxc0,115200 ro debug panic=1"
-#define CONFIG_BOOTCOMMAND "run bootcmd_${boot_mode} bootm_cmd"
+#define DEFAULT_BOOTCMD "run bootcmd_${boot_mode} bootm_cmd"
+#ifndef CONFIG_MFG
+#define CONFIG_BOOTCOMMAND DEFAULT_BOOTCMD
#else
-#define CONFIG_BOOTCOMMAND "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
+#define CONFIG_BOOTCOMMAND "set bootcmd '" DEFAULT_BOOTCMD "';" \
+ "env import " xstr(CONFIG_BOOTCMD_MFG_LOADADDR) ";run bootcmd_mfg"
#define CONFIG_BOOTCMD_MFG_LOADADDR 10500000
#define CONFIG_DELAY_ENVIRONMENT
#endif /* CONFIG_MFG */
#define CONFIG_LOADADDR 18000000
-#define CONFIG_FDTADDR 10001000
+#define CONFIG_FDTADDR 11000000
#define CONFIG_SYS_LOAD_ADDR _pfx(0x, CONFIG_LOADADDR)
#define CONFIG_SYS_FDT_ADDR _pfx(0x, CONFIG_FDTADDR)
-#define CONFIG_IMX_WATCHDOG
-#define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000
+#define CONFIG_HW_WATCHDOG
#ifndef CONFIG_SYS_LVDS_IF
#define DEFAULT_VIDEO_MODE "VGA"
#else
/*
* Extra Environments
*/
-#ifndef CONFIG_MFG
#ifdef CONFIG_ENV_IS_NOWHERE
#define CONFIG_EXTRA_ENV_SETTINGS \
"autostart=no\0" \
"touchpanel=tsc2007\0" \
"video_mode=" DEFAULT_VIDEO_MODE "\0"
#endif /* CONFIG_ENV_IS_NOWHERE */
-#endif /* CONFIG_MFG */
-#ifndef CONFIG_TX6_V2
+#ifndef CONFIG_NO_NAND
#define CONFIG_SYS_DEFAULT_BOOT_MODE "nand"
#define CONFIG_SYS_BOOT_CMD_NAND \
"bootcmd_nand=set autostart no;run bootargs_ubifs;nboot linux\0"
#define MTD_NAME "gpmi-nand"
#define MTDIDS_DEFAULT "nand0=" MTD_NAME
#define CONFIG_SYS_NAND_ONFI_DETECTION
-#define MMC_ROOT_STR " root=dev/mmcblk0p2 rootwait\0"
+#define MMC_ROOT_STR " root=/dev/mmcblk0p2 rootwait\0"
#define ROOTPART_UUID_STR ""
#else
#define CONFIG_SYS_DEFAULT_BOOT_MODE "mmc"
#include <config_cmd_default.h>
#define CONFIG_CMD_CACHE
#define CONFIG_CMD_MMC
-#ifndef CONFIG_TX6_V2
+#ifndef CONFIG_NO_NAND
#define CONFIG_CMD_NAND
#define CONFIG_CMD_MTDPARTS
#endif
#define CONFIG_CMD_BOOTCE
+#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_TIME
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MEMTEST
#define CONFIG_SYS_I2C_BASE I2C1_BASE_ADDR
#define CONFIG_SYS_I2C_MX6_PORT1
#define CONFIG_SYS_I2C_SPEED 400000
-#ifndef CONFIG_TX6_V2
+#if defined(CONFIG_TX6_REV)
+#if CONFIG_TX6_REV == 0x1
#define CONFIG_SYS_I2C_SLAVE 0x3c
-#else
+#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
+#endif /* CONFIG_TX6_REV */
+/* autodetect which PMIC is present to derive TX6_REV */
+#define CONFIG_LTC3676 /* TX6_REV == 1 */
+#define CONFIG_RN5T567 /* TX6_REV == 3 */
+#endif /* CONFIG_CMD_I2C */
#ifndef CONFIG_ENV_IS_NOWHERE
/* define one of the following options:
/*
* NAND flash driver
*/
-#ifdef CONFIG_CMD_NAND
+#ifndef CONFIG_NO_NAND
#define CONFIG_MTD_DEVICE
#if 0
#define CONFIG_MTD_DEBUG
#define CONFIG_APBH_DMA_BURST8
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_SYS_MXS_DMA_CHANNEL 4
-#define CONFIG_SYS_MAX_FLASH_BANKS 1
-#define CONFIG_SYS_NAND_MAX_CHIPS 1
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define CONFIG_SYS_MAX_FLASH_BANKS 0x1
+#define CONFIG_SYS_NAND_MAX_CHIPS 0x1
+#define CONFIG_SYS_MAX_NAND_DEVICE 0x1
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_BASE 0x00000000
#define CONFIG_ENV_RANGE (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
#else
#undef CONFIG_ENV_IS_IN_NAND
-#endif /* CONFIG_CMD_NAND */
+#endif /* CONFIG_NO_NAND */
#ifdef CONFIG_ENV_OFFSET_REDUND
#define CONFIG_SYS_ENV_PART_STR xstr(CONFIG_SYS_ENV_PART_SIZE) \
*/
#ifdef CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_SYS_MMC_ENV_PART 1
+#define CONFIG_SYS_MMC_ENV_PART 0x1
#define CONFIG_DYNAMIC_MMC_DEVNO
#endif /* CONFIG_ENV_IS_IN_MMC */
#else
#define CONFIG_ENV_SIZE SZ_4K
#endif
-#ifndef CONFIG_TX6_V2
+#ifndef CONFIG_NO_NAND
#define MTDPARTS_DEFAULT "mtdparts=" MTD_NAME ":" \
xstr(CONFIG_SYS_U_BOOT_PART_SIZE) \
"@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) \