X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx6.h;h=6cc28b3c89ab992d6b03c9f8f0796b2c2508a8d9;hp=de2d343c28b72ead7d4d8d02a7d48781c1cc1560;hb=e3eef1834ea6cf0f881d2582c706694fb751f018;hpb=427028ef9bd72655085bfe46d459dbf5b2d5ff4c

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index de2d343c28..6cc28b3c89 100644
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -14,6 +14,9 @@
 /*
  * Ka-Ro TX6 board - SoC configuration
  */
+#ifndef CONFIG_TX6_REV
+#define CONFIG_TX6_REV			0x1		/* '1' would be converted to 'y' by define2mk.sed */
+#endif
 #define CONFIG_MX6
 #define CONFIG_SYS_MX6_HCLK		24000000
 #define CONFIG_SYS_MX6_CLK32		32768
@@ -31,7 +34,7 @@
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_IPUV3_CLK		266000000
+#define CONFIG_IPUV3_CLK		(CONFIG_SYS_SDRAM_CLK * 1000000 / 2)
 #define CONFIG_LCD_LOGO
 #define LCD_BPP				LCD_COLOR24
 #define CONFIG_CMD_BMP
@@ -49,8 +52,7 @@
 #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
@@ -65,10 +67,14 @@
  * 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						\
@@ -90,7 +96,7 @@
 #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
@@ -128,8 +134,12 @@
 #define CONFIG_FDTADDR			10001000
 #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
+#define DEFAULT_VIDEO_MODE		"HSD100PXN1"
+#endif
 
 /*
  * Extra Environments
@@ -176,11 +186,11 @@
 	"otg_mode=device\0"						\
 	ROOTPART_UUID_STR						\
 	"touchpanel=tsc2007\0"						\
-	"video_mode=VGA\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"
@@ -212,11 +222,12 @@
 #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
@@ -269,10 +280,17 @@
 #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 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
 
@@ -288,7 +306,7 @@
 /*
  * NAND flash driver
  */
-#ifdef CONFIG_CMD_NAND
+#ifndef CONFIG_NO_NAND
 #define CONFIG_MTD_DEVICE
 #if 0
 #define CONFIG_MTD_DEBUG
@@ -314,7 +332,7 @@
 #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)	\
@@ -360,7 +378,7 @@
 #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)				\