X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx6.h;h=dcd36decc742631644e5d3583652b0b77a92e103;hp=71a3d71b2b98808c6be329421c14e721591aae9d;hb=13a3e2ee237f515af5738c07aaf604db9b54be34;hpb=0db69c20c2e42945cb1e91729fa46111a86b4a9b

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 71a3d71b2b..dcd36decc7 100644
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -43,7 +43,6 @@
 #define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_CMD_GPIO
 
-#ifndef CONFIG_TX6_UBOOT_MFG
 /* LCD Logo and Splash screen support */
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
@@ -64,7 +63,6 @@
 #define CONFIG_BMP_32BPP
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
-#endif /* CONFIG_TX6_UBOOT_MFG */
 
 /*
  * Memory configuration options
@@ -86,7 +84,20 @@
 #define CONFIG_SYS_SDRAM_BUS_WIDTH	64
 #endif
 #endif /* CONFIG_SYS_SDRAM_BUS_WIDTH */
-#define PHYS_SDRAM_1_SIZE		(SZ_512M / 32 * CONFIG_SYS_SDRAM_BUS_WIDTH)
+#ifdef __ASSEMBLY__
+#define _AC(x,s)			x
+#else
+#define _AC(x,s)			(x##s)
+#endif
+#define UL(x)				_AC(x,UL)
+#define PHYS_SDRAM_1_SIZE		(UL(CONFIG_SYS_SDRAM_CHIP_SIZE) * SZ_1M \
+				/ 32 * CONFIG_SYS_SDRAM_BUS_WIDTH)
+#if PHYS_SDRAM_1_SIZE > SZ_1G
+#define FDT_HIGH_STR			"fdt_high=ffffffff\0"
+#else
+#define FDT_HIGH_STR			""
+#endif
+
 #ifdef CONFIG_SOC_MX6Q
 #define CONFIG_SYS_SDRAM_CLK		528
 #else
@@ -171,7 +182,7 @@
 #endif
 
 /*
- * Extra Environments
+ * Extra Environment Settings
  */
 #ifdef CONFIG_TX6_UBOOT_NOENV
 #define CONFIG_EXTRA_ENV_SETTINGS					\
@@ -215,6 +226,7 @@
 	EMMC_BOOT_PART_STR						\
 	EMMC_BOOT_ACK_STR						\
 	"fdtaddr=" xstr(CONFIG_FDTADDR) "\0"				\
+	FDT_HIGH_STR							\
 	FDTSAVE_CMD_STR							\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
@@ -305,17 +317,23 @@
 #error Unsupported TX6 module revision
 #endif
 #else /* CONFIG_TX6_REV */
-/* autodetect which PMIC is present to derive TX6_REV */
 #ifdef CONFIG_SOC_MX6UL
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_SOFT
+#ifdef CONFIG_SYS_I2C_SOFT
+/* NOENV U-Boot is used for initial bootstrap.
+ * Since the TAMPER_PIN_DISABLE fuses have to be programmed
+ * to be able to use the TAMPER pins as GPIO to access the
+ * PMIC I2C bus, this is not possible on virgin hardware.
+ */
 #define CONFIG_SYS_I2C_SOFT_SPEED	400000
+#define CONFIG_SYS_I2C_SPEED		CONFIG_SYS_I2C_SOFT_SPEED
 #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
+#endif /* CONFIG_SYS_I2C_SOFT */
+#else /* !CONFIG_SOC_MX6UL */
+/* autodetect which PMIC is present to derive TX6_REV */
 #define CONFIG_LTC3676			/* TX6_REV == 1 */
-#endif
+#endif /*  CONFIG_SOC_MX6UL */
 #define CONFIG_RN5T567			/* TX6_REV == 3 */
 #endif /* CONFIG_TX6_REV */