X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigs%2Ftx53.h;h=4140cc06fc1e2585df611917c48fcd81fa5db838;hb=f8c818c11d7375cf0694bf2471645e3f4a4ab810;hp=6cf286c5f48209082c6c9722536a16f7dc7ac4a1;hpb=faceb0594ae878a2869c77909c5c28e0bc35347b;p=karo-tx-uboot.git

diff --git a/include/configs/tx53.h b/include/configs/tx53.h
index 6cf286c5f4..4140cc06fc 100644
--- a/include/configs/tx53.h
+++ b/include/configs/tx53.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 <LW@KARO-electronics.de>
+ * Copyright (C) 2012-2014 <LW@KARO-electronics.de>
  *
  * SPDX-License-Identifier:      GPL-2.0
  *
@@ -40,14 +40,8 @@
 #define CONFIG_VIDEO_BMP_RLE8
 #endif /* CONFIG_LCD */
 
-#ifdef CONFIG_SYS_LVDS_IF
-#define is_lvds()			1
-#else
-#define is_lvds()			0
-#endif
-
 /*
- * Memory configurations
+ * Memory configuration options
  */
 #define PHYS_SDRAM_1			0x70000000	/* Base address of bank 1 */
 #define PHYS_SDRAM_1_SIZE		SZ_512M
@@ -61,7 +55,7 @@
 #define CONFIG_STACKSIZE		SZ_128K
 #define CONFIG_SYS_MALLOC_LEN		SZ_8M
 #define CONFIG_SYS_MEMTEST_START	PHYS_SDRAM_1	/* Memtest start address */
-#define CONFIG_SYS_MEMTEST_END		(PHYS_SDRAM_1 + SZ_4M)	/* 4 MB RAM test */
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + SZ_4M)
 #define CONFIG_SYS_SDRAM_CLK		400
 
 /*
@@ -73,7 +67,7 @@
 #define CONFIG_SYS_PBSIZE \
 	(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 						/* Print buffer size */
-#define CONFIG_SYS_MAXARGS		64	/* Max number of command args */
+#define CONFIG_SYS_MAXARGS		256	/* Max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 						/* Boot argument buffer size */
 #define CONFIG_VERSION_VARIABLE			/* U-BOOT version */
@@ -88,8 +82,6 @@
 */
 #define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_DEFAULT_DEVICE_TREE	tx53
-#define CONFIG_ARCH_DEVICE_TREE		mx53
 #define CONFIG_SYS_FDT_ADDR		(PHYS_SDRAM_1 + SZ_16M)
 
 /*
@@ -114,21 +106,25 @@
 #define CONFIG_HW_WATCHDOG
 
 /*
- * Extra Environments
+ * Extra Environment Settings
  */
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"autostart=no\0"						\
 	"baseboard=stk5-v3\0"						\
-	"bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"	\
-	" root=/dev/mmcblk0p3 rootwait\0"				\
-	"bootargs_nand=run default_bootargs;set bootargs ${bootargs}"	\
+	"bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"	\
 	" root=/dev/mtdblock3 rootfstype=jffs2\0"			\
+	"bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"	\
+	" root=/dev/mmcblk0p2 rootwait\0"				\
 	"bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"	\
 	" root=/dev/nfs nfsroot=${nfs_server}:${nfsroot},nolock"	\
 	" ip=dhcp\0"							\
+	"bootargs_ubifs=run default_bootargs;set bootargs ${bootargs}"	\
+	" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"		\
+	"bootcmd_jffs2=set autostart no;run bootargs_jffs2"		\
+	";nboot linux\0"						\
 	"bootcmd_mmc=set autostart no;run bootargs_mmc"			\
-	";mmc read ${loadaddr} 100 3000\0"				\
-	"bootcmd_nand=set autostart no;run bootargs_nand"		\
+	";fatload mmc 0 ${loadaddr} uImage\0"				\
+	"bootcmd_nand=set autostart no;run bootargs_ubifs"		\
 	";nboot linux\0"						\
 	"bootcmd_net=set autoload y;set autostart n;run bootargs_nfs"	\
 	";dhcp\0"							\
@@ -169,11 +165,15 @@
  */
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE		UART1_BASE
-#define CONFIG_MXC_GPIO
 #define CONFIG_BAUDRATE			115200		/* Default baud rate */
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, }
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 
+/*
+ * GPIO driver
+ */
+#define CONFIG_MXC_GPIO
+
 /*
  * Ethernet Driver
  */
@@ -218,8 +218,6 @@
 #define CONFIG_MXC_NAND_IP_REGS_BASE	NFC_BASE_ADDR
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_SYS_MAX_FLASH_SECT	1024
-#define CONFIG_SYS_MAX_FLASH_BANKS	1
 #define CONFIG_SYS_NAND_MAX_CHIPS	1
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
@@ -230,14 +228,8 @@
 #define CONFIG_ENV_SIZE			0x20000 /* 128 KiB */
 #define CONFIG_ENV_RANGE		0x60000
 #endif
-#ifndef CONFIG_SYS_NO_FLASH
-#define CONFIG_CMD_FLASH
-#define CONFIG_SYS_NAND_BASE		0xa0000000
-#define CONFIG_FIT
-#else
 #define CONFIG_SYS_NAND_BASE		0x00000000
 #define CONFIG_CMD_ROMUPDATE
-#endif
 #endif /* CONFIG_CMD_NAND */
 
 /*
@@ -251,7 +243,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
-#define CONFIG_SYS_FSL_ESDHC_NUM	2
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT