From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 12 Jun 2015 08:35:06 +0000 (+0200)
Subject: karo: config: update config files
X-Git-Tag: KARO-TXA5-2015-06-26~36
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=0d7420f68487ae3fd43223b0a880fe7a4f7a116d

karo: config: update config files
---

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index fe7cd1916e..27b51db822 100644
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -184,13 +184,11 @@
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 #define CONFIG_SYS_CACHELINE_SIZE	32
 
-#ifndef CONFIG_TX28_S
-#else
+#ifdef CONFIG_FEC_MXC_PHYADDR
 #define IMX_FEC_BASE			MXS_ENET0_BASE
 #endif
 
 #define CONFIG_FEC_XCV_TYPE		RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_MII
 /* Add for working with "strict" DHCP server */
 #define CONFIG_BOOTP_SUBNETMASK
@@ -208,7 +206,7 @@
 /*
  * NAND flash driver
  */
-#ifdef CONFIG_CMD_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_BLOCK_SIZE	SZ_128K
 #define CONFIG_NAND_MXS
 #define CONFIG_APBH_DMA
@@ -285,7 +283,6 @@
 					GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL
 #define CONFIG_SPL_START_S_PATH		"arch/arm/cpu/arm926ejs/mxs"
 #define CONFIG_SPL_LDSCRIPT		"arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
diff --git a/include/configs/tx48.h b/include/configs/tx48.h
index 9c21e10222..e26bf9cf19 100644
--- a/include/configs/tx48.h
+++ b/include/configs/tx48.h
@@ -35,6 +35,7 @@
 /* LCD Logo and Splash screen support */
 #define CONFIG_LCD
 #ifdef CONFIG_LCD
+#define CONFIG_VIDEO_DA8XX
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_AM335X_LCD
@@ -183,7 +184,6 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_DRIVER_TI_CPSW
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_GIGE
 #define CONFIG_CMD_MII
 /* Add for working with "strict" DHCP server */
@@ -196,7 +196,7 @@
 /*
  * NAND flash driver
  */
-#ifdef CONFIG_CMD_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_NAND_OMAP_GPMC
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_SYS_GPMC_PREFETCH_ENABLE
@@ -227,8 +227,6 @@
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#ifndef CONFIG_ENV_IS_IN_NAND
-#endif
 #define CONFIG_OMAP_HSMMC
 #define CONFIG_OMAP_MMC_DEV_1
 
@@ -250,6 +248,10 @@
 #endif /* CONFIG_ENV_IS_IN_MMC */
 #endif /* CONFIG_CMD_MMC */
 
+#ifdef CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE			SZ_4K
+#endif
+
 #ifdef CONFIG_ENV_OFFSET_REDUND
 #define MTDPARTS_DEFAULT		"mtdparts=" MTD_NAME ":"	\
 	"128k(u-boot-spl),"						\
@@ -277,7 +279,6 @@
 #define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
 
 /* Defines for SPL */
-#define CONFIG_SPL
 #define CONFIG_SPL_FRAMEWORK
 #define CONFIG_SPL_MAX_SIZE		(SRAM_SCRATCH_SPACE_ADDR - CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_GPIO_SUPPORT
diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 96d82a2ed4..ce7e46e4b1 100644
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -8,6 +8,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define CONFIG_MX53			/* must be defined before including imx-regs.h */
+
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
@@ -170,6 +172,7 @@
  */
 #ifdef CONFIG_FEC_MXC
 #define IMX_FEC_BASE			FEC_BASE_ADDR
+#define CONFIG_FEC_MXC_PHYADDR		0
 #define CONFIG_FEC_XCV_TYPE		MII100
 #define CONFIG_CMD_MII
 /* Add for working with "strict" DHCP server */
@@ -184,7 +187,6 @@
 #ifdef CONFIG_CMD_I2C
 #define CONFIG_I2C_MXC
 #define CONFIG_SYS_I2C_BASE		I2C1_BASE_ADDR
-#define CONFIG_SYS_I2C_MX6_PORT1
 #define CONFIG_SYS_I2C_SPEED		400000
 #define CONFIG_SYS_I2C_SLAVE		0x34
 #endif