Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Tom Rini
2 parents 80a7cac033 157f45da91
Showing 4 changed files Side-by-side Diff
arch/arm/cpu/armv7/mx6/clock.c
arch/arm/cpu/armv7/mx6/soc.c
include/configs/m28evk.h
include/configs/m53evk.h
@@ -80,7 +80,7 @@
 		div = __raw_readl(&imx_ccm->analog_pll_sys);
 		div &= BM_ANADIG_PLL_SYS_DIV_SELECT;
  
-		return infreq * (div >> 1);
+		return (infreq * div) >> 1;
 	case PLL_BUS:
 		div = __raw_readl(&imx_ccm->analog_pll_528);
 		div &= BM_ANADIG_PLL_528_DIV_SELECT;
@@ -124,10 +124,9 @@
 }
  
 /*
- * Set the VDDSOC
+ * Set the PMU_REG_CORE register
  *
- * Mask out the REG_CORE[22:18] bits (REG2_TRIG) and set
- * them to the specified millivolt level.
+ * Set LDO_SOC/PU/ARM regulators to the specified millivolt level.
  * Possible values are from 0.725V to 1.450V in steps of
  * 0.025V (25mV).
  */
@@ -12,17 +12,25 @@
 #define MACH_TYPE_M28EVK	3613
 #define CONFIG_MACH_TYPE	MACH_TYPE_M28EVK
  
+#define CONFIG_FIT
+
+#define CONFIG_TIMESTAMP		/* Print image info with timestamp */
+
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
 #include <config_cmd_default.h>
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DOS_PARTITION
+#define CONFIG_FAT_WRITE
  
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BMP
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_GREPENV
@@ -56,8 +64,8 @@
 #if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE		(128 * 1024)
-#define CONFIG_ENV_RANGE		(512 * 1024)
-#define CONFIG_ENV_OFFSET		0x300000
+#define CONFIG_ENV_RANGE		(4 * CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET		(24 * CONFIG_ENV_SECT_SIZE) /* 3 MiB */
 #define CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
  
@@ -71,13 +79,12 @@
 #define MTDIDS_DEFAULT			"nand0=gpmi-nand"
 #define MTDPARTS_DEFAULT			\
 	"mtdparts=gpmi-nand:"			\
-		"3m(bootloader)ro,"		\
-		"512k(environment),"		\
-		"512k(redundant-environment),"	\
-		"4m(kernel),"			\
-		"128k(fdt),"			\
-		"8m(ramdisk),"			\
-		"-(filesystem)"
+		"3m(u-boot),"			\
+		"512k(env1),"			\
+		"512k(env2),"			\
+		"14m(boot),"			\
+		"238m(data),"			\
+		"-@4096k(UBI)"
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #endif
  
  
  
  
@@ -145,19 +152,33 @@
 #define	CONFIG_BMP_16BPP
 #define	CONFIG_VIDEO_BMP_RLE8
 #define	CONFIG_VIDEO_BMP_GZIP
-#define	CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(512 << 10)
+#define	CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)
 #endif
  
 /* Booting Linux */
 #define CONFIG_BOOTDELAY	3
-#define CONFIG_BOOTFILE		"uImage"
+#define CONFIG_BOOTFILE		"fitImage"
 #define CONFIG_BOOTARGS		"console=ttyAMA0,115200n8 "
-#define CONFIG_BOOTCOMMAND	"run bootcmd_net"
+#define CONFIG_BOOTCOMMAND	"run mmc_mmc"
 #define CONFIG_LOADADDR		0x42000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
  
 /* Extra Environment */
+#define CONFIG_PREBOOT		"run try_bootscript"
+#define CONFIG_HOSTNAME		m28evk
+
 #define CONFIG_EXTRA_ENV_SETTINGS					\
+	"consdev=ttyAMA0\0"						\
+	"baudrate=115200\0"						\
+	"bootdev=/dev/mmcblk0p2\0"					\
+	"rootdev=/dev/mmcblk0p3\0"					\
+	"netdev=eth0\0"							\
+	"hostname=m28evk\0"						\
+	"rootpath=/opt/eldk-5.5/armv5te/rootfs-qte-sdk\0"		\
+	"kernel_addr_r=0x42000000\0"					\
+	"videomode=video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066,"	\
+		"le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296,"	\
+		"vmode:0\0"						\
 	"update_nand_full_filename=u-boot.nand\0"			\
 	"update_nand_firmware_filename=u-boot.sb\0"			\
 	"update_sd_firmware_filename=u-boot.sd\0"			\
@@ -173,7 +194,7 @@
 		"if tftp ${update_nand_full_filename} ; then "		\
 		"run update_nand_get_fcb_size ; "			\
 		"nand scrub -y 0x0 ${filesize} ; "			\
-		"nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; "	\
+		"nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; "		\
 		"setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
 		"setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
 		"nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
@@ -195,6 +216,73 @@
 		"setexpr fw_sz ${fw_sz} + 1 ; "				\
 		"mmc write ${loadaddr} 0x800 ${fw_sz} ; "		\
 		"fi ; "							\
+		"fi\0"							\
+	"addcons="							\
+		"setenv bootargs ${bootargs} "				\
+		"console=${consdev},${baudrate}\0"			\
+	"addip="							\
+		"setenv bootargs ${bootargs} "				\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:"		\
+			"${netmask}:${hostname}:${netdev}:off\0"	\
+	"addmisc="							\
+		"setenv bootargs ${bootargs} ${miscargs}\0"		\
+	"adddfltmtd="							\
+		"if test \"x${mtdparts}\" == \"x\" ; then "		\
+			"mtdparts default ; "				\
+		"fi\0"							\
+	"addmtd="							\
+		"run adddfltmtd ; "					\
+		"setenv bootargs ${bootargs} ${mtdparts}\0"		\
+	"addargs=run addcons addmtd addmisc\0"				\
+	"mmcload="							\
+		"mmc rescan ; "						\
+		"ext4load mmc 0:2 ${kernel_addr_r} ${bootfile}\0"	\
+	"ubiload="							\
+		"ubi part UBI ; ubifsmount ubi0:rootfs ; "		\
+		"ubifsload ${kernel_addr_r} /boot/${bootfile}\0"	\
+	"netload="							\
+		"tftp ${kernel_addr_r} ${hostname}/${bootfile}\0"	\
+	"miscargs=nohlt panic=1\0"					\
+	"mmcargs=setenv bootargs root=${rootdev} rw rootwait\0"		\
+	"ubiargs="							\
+		"setenv bootargs ubi.mtd=5 "				\
+		"root=ubi0:rootfs rootfstype=ubifs\0"			\
+	"nfsargs="							\
+		"setenv bootargs root=/dev/nfs rw "			\
+			"nfsroot=${serverip}:${rootpath},v3,tcp\0"	\
+	"mmc_mmc="							\
+		"run mmcload mmcargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"mmc_ubi="							\
+		"run mmcload ubiargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"mmc_nfs="							\
+		"run mmcload nfsargs addip addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"ubi_mmc="							\
+		"run ubiload mmcargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"ubi_ubi="							\
+		"run ubiload ubiargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"ubi_nfs="							\
+		"run ubiload nfsargs addip addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"net_mmc="							\
+		"run netload mmcargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"net_ubi="							\
+		"run netload ubiargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"net_nfs="							\
+		"run netload nfsargs addip addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"try_bootscript="						\
+		"mmc rescan;"						\
+		"if ext4load mmc 0:2 ${kernel_addr_r} ${bootscript};"	\
+		"then;"							\
+			"\techo Running bootscript...;"			\
+			"\tsource ${kernel_addr_r};"			\
 		"fi\0"
  
 /* The rest of the configuration is shared */
@@ -19,17 +19,26 @@
 #define CONFIG_REVISION_TAG
 #define CONFIG_SYS_NO_FLASH
  
+#define CONFIG_FIT
+
+#define CONFIG_TIMESTAMP		/* Print image info with timestamp */
+
 /*
  * U-Boot Commands
  */
 #include <config_cmd_default.h>
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_DOS_PARTITION
+#define CONFIG_FAT_WRITE
  
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BMP
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
+#define CONFIG_CMD_EXT4_WRITE
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_GREPENV
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_MMC
@@ -37,6 +46,7 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SATA
+#define CONFIG_CMD_SETEXPR
 #define CONFIG_CMD_USB
 #define CONFIG_VIDEO
  
@@ -119,8 +129,8 @@
 #define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE		(128 * 1024)
-#define CONFIG_ENV_RANGE		(512 * 1024)
-#define CONFIG_ENV_OFFSET		0x100000
+#define CONFIG_ENV_RANGE		(4 * CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET		(8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */
 #define CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
  
@@ -134,13 +144,12 @@
 #define MTDIDS_DEFAULT			"nand0=mxc_nand"
 #define MTDPARTS_DEFAULT			\
 	"mtdparts=mxc_nand:"			\
-		"1m(bootloader)ro,"		\
-		"512k(environment),"		\
-		"512k(redundant-environment),"	\
-		"4m(kernel),"			\
-		"128k(fdt),"			\
-		"8m(ramdisk),"			\
-		"-(filesystem)"
+		"1024k(u-boot),"		\
+		"512k(env1),"			\
+		"512k(env2),"			\
+		"14m(boot),"			\
+		"240m(data),"			\
+		"-@2048k(UBI)"
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #endif
@@ -157,6 +166,7 @@
 #define CONFIG_FEC_XCV_TYPE		RMII
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_MICREL
+#define CONFIG_ETHPRIME			"FEC0"
 #endif
  
 /*
  
  
@@ -214,10 +224,14 @@
 #define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASHIMAGE_GUARD
+#define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_BMP_16BPP
 #define CONFIG_VIDEO_LOGO
-#define CONFIG_IPUV3_CLK	200000000
+#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE	(2 << 20)
+#define CONFIG_IPUV3_CLK		200000000
 #endif
  
 /*
  
@@ -228,9 +242,10 @@
 #define CONFIG_REVISION_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_BOOTDELAY	3
-#define CONFIG_BOOTFILE		"m53evk/uImage"
+#define CONFIG_BOOTFILE		"fitImage"
 #define CONFIG_BOOTARGS		"console=ttymxc1,115200"
 #define CONFIG_LOADADDR		0x70800000
+#define CONFIG_BOOTCOMMAND	"run mmc_mmc"
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 #define CONFIG_OF_LIBFDT
  
@@ -256,6 +271,89 @@
 #define CONFIG_SYS_NAND_PAGE_COUNT	64
 #define CONFIG_SYS_NAND_SIZE		(256 * 1024 * 1024)
 #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0
+
+/*
+ * Extra Environments
+ */
+#define CONFIG_PREBOOT		"run try_bootscript"
+#define CONFIG_HOSTNAME		m53evk
+
+#define CONFIG_EXTRA_ENV_SETTINGS					\
+	"consdev=ttymxc1\0"						\
+	"baudrate=115200\0"						\
+	"bootscript=boot.scr\0"						\
+	"bootdev=/dev/mmcblk0p1\0"					\
+	"rootdev=/dev/mmcblk0p2\0"					\
+	"netdev=eth0\0"							\
+	"rootpath=/opt/eldk-5.5/armv7a-hf/rootfs-qte-sdk\0"		\
+	"kernel_addr_r=0x72000000\0"					\
+	"addcons="							\
+		"setenv bootargs ${bootargs} "				\
+		"console=${consdev},${baudrate}\0"			\
+	"addip="							\
+		"setenv bootargs ${bootargs} "				\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:"		\
+			"${netmask}:${hostname}:${netdev}:off\0"	\
+	"addmisc="							\
+		"setenv bootargs ${bootargs} ${miscargs}\0"		\
+	"adddfltmtd="							\
+		"if test \"x${mtdparts}\" == \"x\" ; then "		\
+			"mtdparts default ; "				\
+		"fi\0"							\
+	"addmtd="							\
+		"run adddfltmtd ; "					\
+		"setenv bootargs ${bootargs} ${mtdparts}\0"		\
+	"addargs=run addcons addmtd addmisc\0"				\
+	"mmcload="							\
+		"mmc rescan ; "						\
+		"ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0"	\
+	"ubiload="							\
+		"ubi part UBI ; ubifsmount ubi0:rootfs ; "		\
+		"ubifsload ${kernel_addr_r} /boot/${bootfile}\0"	\
+	"netload="							\
+		"tftp ${kernel_addr_r} ${hostname}/${bootfile}\0"	\
+	"miscargs=nohlt panic=1\0"					\
+	"mmcargs=setenv bootargs root=${rootdev} rw rootwait\0"		\
+	"ubiargs="							\
+		"setenv bootargs ubi.mtd=5 "				\
+		"root=ubi0:rootfs rootfstype=ubifs\0"			\
+	"nfsargs="							\
+		"setenv bootargs root=/dev/nfs rw "			\
+			"nfsroot=${serverip}:${rootpath},v3,tcp\0"	\
+	"mmc_mmc="							\
+		"run mmcload mmcargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"mmc_ubi="							\
+		"run mmcload ubiargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"mmc_nfs="							\
+		"run mmcload nfsargs addip addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"ubi_mmc="							\
+		"run ubiload mmcargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"ubi_ubi="							\
+		"run ubiload ubiargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"ubi_nfs="							\
+		"run ubiload nfsargs addip addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"net_mmc="							\
+		"run netload mmcargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"net_ubi="							\
+		"run netload ubiargs addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"net_nfs="							\
+		"run netload nfsargs addip addargs ; "			\
+		"bootm ${kernel_addr_r}\0"				\
+	"try_bootscript="						\
+		"mmc rescan;"						\
+		"if ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};"	\
+		"then;"							\
+			"\techo Running bootscript...;"			\
+			"\tsource ${kernel_addr_r};"			\
+		"fi\0"
  
 #endif	/* __M53EVK_CONFIG_H__ */
...	...	@@ -80,7 +80,7 @@
80	80	div = __raw_readl(&imx_ccm->analog_pll_sys);
81	81	div &= BM_ANADIG_PLL_SYS_DIV_SELECT;
82	82
83		- return infreq * (div >> 1);
	83	+ return (infreq * div) >> 1;
84	84	case PLL_BUS:
85	85	div = __raw_readl(&imx_ccm->analog_pll_528);
86	86	div &= BM_ANADIG_PLL_528_DIV_SELECT;
...	...	@@ -124,10 +124,9 @@
124	124	}
125	125
126	126	/*
127		- * Set the VDDSOC
	127	+ * Set the PMU_REG_CORE register
128	128	*
129		- * Mask out the REG_CORE[22:18] bits (REG2_TRIG) and set
130		- * them to the specified millivolt level.
	129	+ * Set LDO_SOC/PU/ARM regulators to the specified millivolt level.
131	130	* Possible values are from 0.725V to 1.450V in steps of
132	131	* 0.025V (25mV).
133	132	*/
...	...	@@ -12,17 +12,25 @@
12	12	#define MACH_TYPE_M28EVK 3613
13	13	#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
14	14
	15	+#define CONFIG_FIT
	16	+
	17	+#define CONFIG_TIMESTAMP /* Print image info with timestamp */
	18	+
15	19	/* U-Boot Commands */
16	20	#define CONFIG_SYS_NO_FLASH
17	21	#include <config_cmd_default.h>
18	22	#define CONFIG_DISPLAY_CPUINFO
19	23	#define CONFIG_DOS_PARTITION
	24	+#define CONFIG_FAT_WRITE
20	25
	26	+#define CONFIG_CMD_ASKENV
	27	+#define CONFIG_CMD_BMP
21	28	#define CONFIG_CMD_CACHE
22	29	#define CONFIG_CMD_DATE
23	30	#define CONFIG_CMD_DHCP
24	31	#define CONFIG_CMD_EEPROM
25		-#define CONFIG_CMD_EXT2
	32	+#define CONFIG_CMD_EXT4
	33	+#define CONFIG_CMD_EXT4_WRITE
26	34	#define CONFIG_CMD_FAT
27	35	#define CONFIG_CMD_GPIO
28	36	#define CONFIG_CMD_GREPENV
...	...	@@ -56,8 +64,8 @@
56	64	#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
57	65	#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
58	66	#define CONFIG_ENV_SECT_SIZE (128 * 1024)
59		-#define CONFIG_ENV_RANGE (512 * 1024)
60		-#define CONFIG_ENV_OFFSET 0x300000
	67	+#define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE)
	68	+#define CONFIG_ENV_OFFSET (24 * CONFIG_ENV_SECT_SIZE) /* 3 MiB */
61	69	#define CONFIG_ENV_OFFSET_REDUND \
62	70	(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
63	71
...	...	@@ -71,13 +79,12 @@
71	79	#define MTDIDS_DEFAULT "nand0=gpmi-nand"
72	80	#define MTDPARTS_DEFAULT \
73	81	"mtdparts=gpmi-nand:" \
74		- "3m(bootloader)ro," \
75		- "512k(environment)," \
76		- "512k(redundant-environment)," \
77		- "4m(kernel)," \
78		- "128k(fdt)," \
79		- "8m(ramdisk)," \
80		- "-(filesystem)"
	82	+ "3m(u-boot)," \
	83	+ "512k(env1)," \
	84	+ "512k(env2)," \
	85	+ "14m(boot)," \
	86	+ "238m(data)," \
	87	+ "-@4096k(UBI)"
81	88	#else
82	89	#define CONFIG_ENV_IS_NOWHERE
83	90	#endif
84	91
85	92
86	93
87	94
...	...	@@ -145,19 +152,33 @@
145	152	#define CONFIG_BMP_16BPP
146	153	#define CONFIG_VIDEO_BMP_RLE8
147	154	#define CONFIG_VIDEO_BMP_GZIP
148		-#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (512 << 10)
	155	+#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
149	156	#endif
150	157
151	158	/* Booting Linux */
152	159	#define CONFIG_BOOTDELAY 3
153		-#define CONFIG_BOOTFILE "uImage"
	160	+#define CONFIG_BOOTFILE "fitImage"
154	161	#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 "
155		-#define CONFIG_BOOTCOMMAND "run bootcmd_net"
	162	+#define CONFIG_BOOTCOMMAND "run mmc_mmc"
156	163	#define CONFIG_LOADADDR 0x42000000
157	164	#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
158	165
159	166	/* Extra Environment */
	167	+#define CONFIG_PREBOOT "run try_bootscript"
	168	+#define CONFIG_HOSTNAME m28evk
	169	+
160	170	#define CONFIG_EXTRA_ENV_SETTINGS \
	171	+ "consdev=ttyAMA0\0" \
	172	+ "baudrate=115200\0" \
	173	+ "bootdev=/dev/mmcblk0p2\0" \
	174	+ "rootdev=/dev/mmcblk0p3\0" \
	175	+ "netdev=eth0\0" \
	176	+ "hostname=m28evk\0" \
	177	+ "rootpath=/opt/eldk-5.5/armv5te/rootfs-qte-sdk\0" \
	178	+ "kernel_addr_r=0x42000000\0" \
	179	+ "videomode=video=ctfb:x:800,y:480,depth:18,mode:0,pclk:30066," \
	180	+ "le:0,ri:256,up:0,lo:45,hs:1,vs:1,sync:100663296," \
	181	+ "vmode:0\0" \
161	182	"update_nand_full_filename=u-boot.nand\0" \
162	183	"update_nand_firmware_filename=u-boot.sb\0" \
163	184	"update_sd_firmware_filename=u-boot.sd\0" \
...	...	@@ -173,7 +194,7 @@
173	194	"if tftp ${update_nand_full_filename} ; then " \
174	195	"run update_nand_get_fcb_size ; " \
175	196	"nand scrub -y 0x0 ${filesize} ; " \
176		- "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; " \
	197	+ "nand write.raw ${loadaddr} 0x0 ${fcb_sz} ; " \
177	198	"setexpr update_off ${loadaddr} + ${update_nand_fcb} ; " \
178	199	"setexpr update_sz ${filesize} - ${update_nand_fcb} ; " \
179	200	"nand write ${update_off} ${update_nand_fcb} ${update_sz} ; " \
...	...	@@ -195,6 +216,73 @@
195	216	"setexpr fw_sz ${fw_sz} + 1 ; " \
196	217	"mmc write ${loadaddr} 0x800 ${fw_sz} ; " \
197	218	"fi ; " \
	219	+ "fi\0" \
	220	+ "addcons=" \
	221	+ "setenv bootargs ${bootargs} " \
	222	+ "console=${consdev},${baudrate}\0" \
	223	+ "addip=" \
	224	+ "setenv bootargs ${bootargs} " \
	225	+ "ip=${ipaddr}:${serverip}:${gatewayip}:" \
	226	+ "${netmask}:${hostname}:${netdev}:off\0" \
	227	+ "addmisc=" \
	228	+ "setenv bootargs ${bootargs} ${miscargs}\0" \
	229	+ "adddfltmtd=" \
	230	+ "if test \"x${mtdparts}\" == \"x\" ; then " \
	231	+ "mtdparts default ; " \
	232	+ "fi\0" \
	233	+ "addmtd=" \
	234	+ "run adddfltmtd ; " \
	235	+ "setenv bootargs ${bootargs} ${mtdparts}\0" \
	236	+ "addargs=run addcons addmtd addmisc\0" \
	237	+ "mmcload=" \
	238	+ "mmc rescan ; " \
	239	+ "ext4load mmc 0:2 ${kernel_addr_r} ${bootfile}\0" \
	240	+ "ubiload=" \
	241	+ "ubi part UBI ; ubifsmount ubi0:rootfs ; " \
	242	+ "ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \
	243	+ "netload=" \
	244	+ "tftp ${kernel_addr_r} ${hostname}/${bootfile}\0" \
	245	+ "miscargs=nohlt panic=1\0" \
	246	+ "mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \
	247	+ "ubiargs=" \
	248	+ "setenv bootargs ubi.mtd=5 " \
	249	+ "root=ubi0:rootfs rootfstype=ubifs\0" \
	250	+ "nfsargs=" \
	251	+ "setenv bootargs root=/dev/nfs rw " \
	252	+ "nfsroot=${serverip}:${rootpath},v3,tcp\0" \
	253	+ "mmc_mmc=" \
	254	+ "run mmcload mmcargs addargs ; " \
	255	+ "bootm ${kernel_addr_r}\0" \
	256	+ "mmc_ubi=" \
	257	+ "run mmcload ubiargs addargs ; " \
	258	+ "bootm ${kernel_addr_r}\0" \
	259	+ "mmc_nfs=" \
	260	+ "run mmcload nfsargs addip addargs ; " \
	261	+ "bootm ${kernel_addr_r}\0" \
	262	+ "ubi_mmc=" \
	263	+ "run ubiload mmcargs addargs ; " \
	264	+ "bootm ${kernel_addr_r}\0" \
	265	+ "ubi_ubi=" \
	266	+ "run ubiload ubiargs addargs ; " \
	267	+ "bootm ${kernel_addr_r}\0" \
	268	+ "ubi_nfs=" \
	269	+ "run ubiload nfsargs addip addargs ; " \
	270	+ "bootm ${kernel_addr_r}\0" \
	271	+ "net_mmc=" \
	272	+ "run netload mmcargs addargs ; " \
	273	+ "bootm ${kernel_addr_r}\0" \
	274	+ "net_ubi=" \
	275	+ "run netload ubiargs addargs ; " \
	276	+ "bootm ${kernel_addr_r}\0" \
	277	+ "net_nfs=" \
	278	+ "run netload nfsargs addip addargs ; " \
	279	+ "bootm ${kernel_addr_r}\0" \
	280	+ "try_bootscript=" \
	281	+ "mmc rescan;" \
	282	+ "if ext4load mmc 0:2 ${kernel_addr_r} ${bootscript};" \
	283	+ "then;" \
	284	+ "\techo Running bootscript...;" \
	285	+ "\tsource ${kernel_addr_r};" \
198	286	"fi\0"
199	287
200	288	/* The rest of the configuration is shared */
...	...	@@ -19,17 +19,26 @@
19	19	#define CONFIG_REVISION_TAG
20	20	#define CONFIG_SYS_NO_FLASH
21	21
	22	+#define CONFIG_FIT
	23	+
	24	+#define CONFIG_TIMESTAMP /* Print image info with timestamp */
	25	+
22	26	/*
23	27	* U-Boot Commands
24	28	*/
25	29	#include <config_cmd_default.h>
26	30	#define CONFIG_DISPLAY_BOARDINFO
27	31	#define CONFIG_DOS_PARTITION
	32	+#define CONFIG_FAT_WRITE
28	33
	34	+#define CONFIG_CMD_ASKENV
	35	+#define CONFIG_CMD_BMP
29	36	#define CONFIG_CMD_DATE
30	37	#define CONFIG_CMD_DHCP
31		-#define CONFIG_CMD_EXT2
	38	+#define CONFIG_CMD_EXT4
	39	+#define CONFIG_CMD_EXT4_WRITE
32	40	#define CONFIG_CMD_FAT
	41	+#define CONFIG_CMD_GREPENV
33	42	#define CONFIG_CMD_I2C
34	43	#define CONFIG_CMD_MII
35	44	#define CONFIG_CMD_MMC
...	...	@@ -37,6 +46,7 @@
37	46	#define CONFIG_CMD_NET
38	47	#define CONFIG_CMD_PING
39	48	#define CONFIG_CMD_SATA
	49	+#define CONFIG_CMD_SETEXPR
40	50	#define CONFIG_CMD_USB
41	51	#define CONFIG_VIDEO
42	52
...	...	@@ -119,8 +129,8 @@
119	129	#define CONFIG_ENV_IS_IN_NAND
120	130	#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
121	131	#define CONFIG_ENV_SECT_SIZE (128 * 1024)
122		-#define CONFIG_ENV_RANGE (512 * 1024)
123		-#define CONFIG_ENV_OFFSET 0x100000
	132	+#define CONFIG_ENV_RANGE (4 * CONFIG_ENV_SECT_SIZE)
	133	+#define CONFIG_ENV_OFFSET (8 * CONFIG_ENV_SECT_SIZE) /* 1 MiB */
124	134	#define CONFIG_ENV_OFFSET_REDUND \
125	135	(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
126	136
...	...	@@ -134,13 +144,12 @@
134	144	#define MTDIDS_DEFAULT "nand0=mxc_nand"
135	145	#define MTDPARTS_DEFAULT \
136	146	"mtdparts=mxc_nand:" \
137		- "1m(bootloader)ro," \
138		- "512k(environment)," \
139		- "512k(redundant-environment)," \
140		- "4m(kernel)," \
141		- "128k(fdt)," \
142		- "8m(ramdisk)," \
143		- "-(filesystem)"
	147	+ "1024k(u-boot)," \
	148	+ "512k(env1)," \
	149	+ "512k(env2)," \
	150	+ "14m(boot)," \
	151	+ "240m(data)," \
	152	+ "-@2048k(UBI)"
144	153	#else
145	154	#define CONFIG_ENV_IS_NOWHERE
146	155	#endif
...	...	@@ -157,6 +166,7 @@
157	166	#define CONFIG_FEC_XCV_TYPE RMII
158	167	#define CONFIG_PHYLIB
159	168	#define CONFIG_PHY_MICREL
	169	+#define CONFIG_ETHPRIME "FEC0"
160	170	#endif
161	171
162	172	/*
163	173
164	174
...	...	@@ -214,10 +224,14 @@
214	224	#define CONFIG_VGA_AS_SINGLE_DEVICE
215	225	#define CONFIG_SYS_CONSOLE_IS_IN_ENV
216	226	#define CONFIG_VIDEO_BMP_RLE8
	227	+#define CONFIG_VIDEO_BMP_GZIP
217	228	#define CONFIG_SPLASH_SCREEN
	229	+#define CONFIG_SPLASHIMAGE_GUARD
	230	+#define CONFIG_SPLASH_SCREEN_ALIGN
218	231	#define CONFIG_BMP_16BPP
219	232	#define CONFIG_VIDEO_LOGO
220		-#define CONFIG_IPUV3_CLK 200000000
	233	+#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (2 << 20)
	234	+#define CONFIG_IPUV3_CLK 200000000
221	235	#endif
222	236
223	237	/*
224	238
...	...	@@ -228,9 +242,10 @@
228	242	#define CONFIG_REVISION_TAG
229	243	#define CONFIG_SETUP_MEMORY_TAGS
230	244	#define CONFIG_BOOTDELAY 3
231		-#define CONFIG_BOOTFILE "m53evk/uImage"
	245	+#define CONFIG_BOOTFILE "fitImage"
232	246	#define CONFIG_BOOTARGS "console=ttymxc1,115200"
233	247	#define CONFIG_LOADADDR 0x70800000
	248	+#define CONFIG_BOOTCOMMAND "run mmc_mmc"
234	249	#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
235	250	#define CONFIG_OF_LIBFDT
236	251
...	...	@@ -256,6 +271,89 @@
256	271	#define CONFIG_SYS_NAND_PAGE_COUNT 64
257	272	#define CONFIG_SYS_NAND_SIZE (256 * 1024 * 1024)
258	273	#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
	274	+
	275	+/*
	276	+ * Extra Environments
	277	+ */
	278	+#define CONFIG_PREBOOT "run try_bootscript"
	279	+#define CONFIG_HOSTNAME m53evk
	280	+
	281	+#define CONFIG_EXTRA_ENV_SETTINGS \
	282	+ "consdev=ttymxc1\0" \
	283	+ "baudrate=115200\0" \
	284	+ "bootscript=boot.scr\0" \
	285	+ "bootdev=/dev/mmcblk0p1\0" \
	286	+ "rootdev=/dev/mmcblk0p2\0" \
	287	+ "netdev=eth0\0" \
	288	+ "rootpath=/opt/eldk-5.5/armv7a-hf/rootfs-qte-sdk\0" \
	289	+ "kernel_addr_r=0x72000000\0" \
	290	+ "addcons=" \
	291	+ "setenv bootargs ${bootargs} " \
	292	+ "console=${consdev},${baudrate}\0" \
	293	+ "addip=" \
	294	+ "setenv bootargs ${bootargs} " \
	295	+ "ip=${ipaddr}:${serverip}:${gatewayip}:" \
	296	+ "${netmask}:${hostname}:${netdev}:off\0" \
	297	+ "addmisc=" \
	298	+ "setenv bootargs ${bootargs} ${miscargs}\0" \
	299	+ "adddfltmtd=" \
	300	+ "if test \"x${mtdparts}\" == \"x\" ; then " \
	301	+ "mtdparts default ; " \
	302	+ "fi\0" \
	303	+ "addmtd=" \
	304	+ "run adddfltmtd ; " \
	305	+ "setenv bootargs ${bootargs} ${mtdparts}\0" \
	306	+ "addargs=run addcons addmtd addmisc\0" \
	307	+ "mmcload=" \
	308	+ "mmc rescan ; " \
	309	+ "ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0" \
	310	+ "ubiload=" \
	311	+ "ubi part UBI ; ubifsmount ubi0:rootfs ; " \
	312	+ "ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \
	313	+ "netload=" \
	314	+ "tftp ${kernel_addr_r} ${hostname}/${bootfile}\0" \
	315	+ "miscargs=nohlt panic=1\0" \
	316	+ "mmcargs=setenv bootargs root=${rootdev} rw rootwait\0" \
	317	+ "ubiargs=" \
	318	+ "setenv bootargs ubi.mtd=5 " \
	319	+ "root=ubi0:rootfs rootfstype=ubifs\0" \
	320	+ "nfsargs=" \
	321	+ "setenv bootargs root=/dev/nfs rw " \
	322	+ "nfsroot=${serverip}:${rootpath},v3,tcp\0" \
	323	+ "mmc_mmc=" \
	324	+ "run mmcload mmcargs addargs ; " \
	325	+ "bootm ${kernel_addr_r}\0" \
	326	+ "mmc_ubi=" \
	327	+ "run mmcload ubiargs addargs ; " \
	328	+ "bootm ${kernel_addr_r}\0" \
	329	+ "mmc_nfs=" \
	330	+ "run mmcload nfsargs addip addargs ; " \
	331	+ "bootm ${kernel_addr_r}\0" \
	332	+ "ubi_mmc=" \
	333	+ "run ubiload mmcargs addargs ; " \
	334	+ "bootm ${kernel_addr_r}\0" \
	335	+ "ubi_ubi=" \
	336	+ "run ubiload ubiargs addargs ; " \
	337	+ "bootm ${kernel_addr_r}\0" \
	338	+ "ubi_nfs=" \
	339	+ "run ubiload nfsargs addip addargs ; " \
	340	+ "bootm ${kernel_addr_r}\0" \
	341	+ "net_mmc=" \
	342	+ "run netload mmcargs addargs ; " \
	343	+ "bootm ${kernel_addr_r}\0" \
	344	+ "net_ubi=" \
	345	+ "run netload ubiargs addargs ; " \
	346	+ "bootm ${kernel_addr_r}\0" \
	347	+ "net_nfs=" \
	348	+ "run netload nfsargs addip addargs ; " \
	349	+ "bootm ${kernel_addr_r}\0" \
	350	+ "try_bootscript=" \
	351	+ "mmc rescan;" \
	352	+ "if ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};" \
	353	+ "then;" \
	354	+ "\techo Running bootscript...;" \
	355	+ "\tsource ${kernel_addr_r};" \
	356	+ "fi\0"
259	357
260	358	#endif /* __M53EVK_CONFIG_H__ */