X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=blobdiff_plain;f=include%2Fconfigs%2Ftx28.h;h=5af01dc32f65cb24c9b2228229a499502e2de428;hp=145e0a74b68649108e44d5c05b8d7776d88c6888;hb=2817e70bf7c11c4a0043f764a08b06c964d523ef;hpb=58494052b5fa1c2cbed9f1e04049f2951708cfa3

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index 145e0a74b6..5af01dc32f 100644
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -30,6 +30,7 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_SHOW_ACTIVITY
 #define CONFIG_ARCH_CPU_INIT
+#define CONFIG_ARCH_MISC_INIT		/* init vector table after relocation */
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_LATE_INIT
@@ -67,7 +68,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 */
@@ -83,18 +84,14 @@
 #define CONFIG_OF_LIBFDT
 #ifdef CONFIG_OF_LIBFDT
 #define CONFIG_FDT_FIXUP_PARTITIONS
-#define CONFIG_OF_EMBED
 #define CONFIG_OF_BOARD_SETUP
-#define CONFIG_DEFAULT_DEVICE_TREE	tx28
-#define CONFIG_ARCH_DEVICE_TREE		mx28
-#define CONFIG_SYS_FDT_ADDR		(PHYS_SDRAM_1 + SZ_16M)
 #endif
 
 /*
  * Boot Linux
  */
-#define xstr(s)	str(s)
-#define str(s)	#s
+#define xstr(s)				str(s)
+#define str(s)				#s
 #define __pfx(x, s)			(x##s)
 #define _pfx(x, s)			__pfx(x, s)
 
@@ -106,8 +103,14 @@
 #define CONFIG_BOOTFILE			"uImage"
 #define CONFIG_BOOTARGS			"console=ttyAMA0,115200 ro debug panic=1"
 #define CONFIG_BOOTCOMMAND		"run bootcmd_nand"
+#ifdef CONFIG_TX28_S
+#define CONFIG_LOADADDR			41000000
+#else
 #define CONFIG_LOADADDR			43000000
+#endif
+#define CONFIG_FDTADDR			40001000
 #define CONFIG_SYS_LOAD_ADDR		_pfx(0x, CONFIG_LOADADDR)
+#define CONFIG_SYS_FDT_ADDR		_pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE		SZ_1M
 
 /*
@@ -118,29 +121,35 @@
 	"autostart=no\0"						\
 	"autoload=no\0"							\
 	"bootdelay=-1\0"						\
-	"fdtaddr=11000000\0"						\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"autostart=no\0"						\
 	"baseboard=stk5-v3\0"						\
+	"bootargs_jffs2=run default_bootargs;set bootargs ${bootargs}"	\
+	" root=/dev/mtdblock3 rootfstype=jffs2\0"			\
 	"bootargs_mmc=run default_bootargs;set bootargs ${bootargs}"	\
 	" root=/dev/mmcblk0p3 rootwait\0"				\
-	"bootargs_nand=run default_bootargs;set bootargs ${bootargs}"	\
-	" root=/dev/mtdblock3 rootfstype=jffs2\0"			\
 	"bootargs_nfs=run default_bootargs;set bootargs ${bootargs}"	\
-	" root=/dev/nfs ip=dhcp nfsroot=${nfs_server}:${nfsroot},nolock\0"\
-	"bootcmd_mmc=set autostart no;run bootargs_mmc;"		\
-	"fatload mmc 0 ${loadaddr} uImage;run bootm_cmd\0"		\
-	"bootcmd_nand=set autostart no;run bootargs_nand;"		\
-	"nboot linux;run bootm_cmd\0"					\
-	"bootcmd_net=set autostart no;run bootargs_nfs;dhcp;"		\
-	"run bootm_cmd\0"						\
+	" 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"			\
+	";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"							\
 	"bootm_cmd=bootm ${loadaddr} - ${fdtaddr}\0"			\
+	"boot_mode=nand\0"						\
 	"default_bootargs=set bootargs " CONFIG_BOOTARGS		\
-	" mxsfb.mode=${video_mode} ${append_bootargs}\0"		\
-	"fdtaddr=41000000\0"						\
+	" ${append_bootargs}\0"						\
+	"fdtaddr=" xstr(CONFIG_FDTADDR) "\0"				\
+	"fdtsave=fdt resize;nand erase.part dtb"			\
+	";nand write ${fdtaddr} dtb ${fdtsize}\0"			\
 	"mtdids=" MTDIDS_DEFAULT "\0"					\
 	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
 	"nfsroot=/tftpboot/rootfs\0"					\
@@ -193,6 +202,8 @@
 #define CONFIG_FEC_MXC_PHYADDR		0x00
 #endif
 
+#define CONFIG_PHY_SMSC
+#define CONFIG_PHYLIB
 #define CONFIG_MII
 #define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM
@@ -220,16 +231,15 @@
  * NAND flash driver
  */
 #ifdef CONFIG_CMD_NAND
+#define CONFIG_SYS_NAND_BLOCK_SIZE	SZ_128K
 #define CONFIG_MTD_DEVICE
 #define CONFIG_NAND_MXS
 #define CONFIG_APBH_DMA
 #define CONFIG_APBH_DMA_BURST
 #define CONFIG_APBH_DMA_BURST8
-#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x20000
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_SYS_MXS_DMA_CHANNEL	4
-#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
@@ -242,17 +252,17 @@
 
 #define CONFIG_ENV_OFFSET		(CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
 #define CONFIG_ENV_SIZE			SZ_128K
-#define CONFIG_ENV_RANGE		0x60000
+#define CONFIG_ENV_RANGE		(3 * CONFIG_SYS_NAND_BLOCK_SIZE)
 #ifdef CONFIG_ENV_OFFSET_REDUND
-#define CONFIG_SYS_ENV_PART_STR		xstr(CONFIG_ENV_RANGE)		\
+#define CONFIG_SYS_ENV_PART_STR		xstr(CONFIG_SYS_ENV_PART_SIZE)	\
 	"(env),"							\
-	xstr(CONFIG_ENV_RANGE)						\
+	xstr(CONFIG_SYS_ENV_PART_SIZE)					\
 	"(env2),"
-#define CONFIG_SYS_USERFS_PART_STR	"107904k(userfs)"
+#define CONFIG_SYS_USERFS_PART_STR	xstr(CONFIG_SYS_USERFS_PART_SIZE2) "(userfs)"
 #else
-#define CONFIG_SYS_ENV_PART_STR		xstr(CONFIG_ENV_RANGE)		\
+#define CONFIG_SYS_ENV_PART_STR		xstr(CONFIG_SYS_ENV_PART_SIZE)	\
 	"(env),"
-#define CONFIG_SYS_USERFS_PART_STR	"108288k(userfs)"
+#define CONFIG_SYS_USERFS_PART_STR	xstr(CONFIG_SYS_USERFS_PART_SIZE) "(userfs)"
 #endif /* CONFIG_ENV_OFFSET_REDUND */
 
 /*
@@ -266,6 +276,7 @@
 
 #define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
+#define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
 
 /*
@@ -292,8 +303,9 @@
 #define MTDPARTS_DEFAULT		"mtdparts=" MTD_NAME ":"	\
 	"1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot),"		\
 	CONFIG_SYS_ENV_PART_STR						\
-	"4m(linux),16m(rootfs),"					\
-	CONFIG_SYS_USERFS_PART_STR ",256k(dtb),512k@0x7f80000(bbt)ro"
+	"6m(linux),32m(rootfs)," CONFIG_SYS_USERFS_PART_STR		\
+	",512k@" xstr(CONFIG_SYS_NAND_DTB_OFFSET) "(dtb)"		\
+	",512k@" xstr(CONFIG_SYS_NAND_BBT_OFFSET) "(bbt)ro"
 
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \
@@ -301,9 +313,8 @@
 
 /* Defines for SPL */
 #define CONFIG_SPL
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
-#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_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
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT