X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Ftrab.h;h=a2dc8e7bff8936ccb4137679c03f22d7464b070d;hb=8d7e2732221bc2d64df14f700c64c23e0a4c3dce;hp=7fd3e466e7f628c8a430b937603193cdc834bf95;hpb=6ebc79211420cd856c9825cf3ade8bd6fd54fee5;p=u-boot

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 7fd3e466e7..a2dc8e7bff 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -160,7 +160,6 @@
 				CFG_CMD_DATE			| \
 				CFG_CMD_DHCP			| \
 				CFG_CMD_FAT			| \
-				CFG_CMD_JFFS2			| \
 				CFG_CMD_NFS			| \
 				CFG_CMD_SNTP			| \
 				CFG_CMD_USB	)
@@ -174,7 +173,6 @@
 				CFG_CMD_DATE			| \
 				CFG_CMD_DHCP			| \
 				CFG_CMD_FAT			| \
-				CFG_CMD_JFFS2			| \
 				CFG_CMD_NFS			| \
 				CFG_CMD_SNTP			| \
 				CFG_CMD_USB	)
@@ -222,22 +220,22 @@
 #else /* !CFG_HUSH_PARSER */
 #define	CONFIG_EXTRA_ENV_SETTINGS	\
 	"nfs_args=setenv bootargs root=/dev/nfs rw " \
-		"nfsroot=$(serverip):$(rootpath)\0" \
+		"nfsroot=${serverip}:${rootpath}\0" \
 	"rootpath=/opt/eldk/arm_920TDI\0" \
 	"ram_args=setenv bootargs root=/dev/ram rw\0" \
-	"add_net=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \
-		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \
-	"add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \
+	"add_net=setenv bootargs ${bootargs} ethaddr=${ethaddr} " \
+		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \
+	"add_misc=setenv bootargs ${bootargs} console=ttyS0 panic=1\0" \
 	"u-boot=/tftpboot/TRAB/u-boot.bin\0" \
-	"load=tftp C100000 $(u-boot)\0" \
+	"load=tftp C100000 ${u-boot}\0" \
 	"update=protect off 0 5FFFF;era 0 5FFFF;" \
-		"cp.b C100000 0 $(filesize)\0" \
+		"cp.b C100000 0 ${filesize}\0" \
 	"loadfile=/tftpboot/TRAB/uImage\0" \
 	"loadaddr=c400000\0" \
-	"net_load=tftpboot $(loadaddr) $(loadfile)\0" \
+	"net_load=tftpboot ${loadaddr} ${loadfile}\0" \
 	"net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \
 	"kernel_addr=000C0000\0" \
-	"flash_nfs=run nfs_args add_net add_misc;bootm $(kernel_addr)\0" \
+	"flash_nfs=run nfs_args add_net add_misc;bootm ${kernel_addr}\0" \
 	"mdm_init1=ATZ\0" \
 	"mdm_init2=ATS0=1\0" \
 	"mdm_flow_control=rts/cts\0"
@@ -269,23 +267,23 @@
 #else /* !CFG_HUSH_PARSER */
 #define	CONFIG_EXTRA_ENV_SETTINGS	\
 	"nfs_args=setenv bootargs root=/dev/nfs rw " \
-		"nfsroot=$(serverip):$(rootpath)\0" \
+		"nfsroot=${serverip}:${rootpath}\0" \
 	"rootpath=/opt/eldk/arm_920TDI\0" \
 	"ram_args=setenv bootargs root=/dev/ram rw\0" \
-	"add_net=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \
-		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0" \
-	"add_misc=setenv bootargs $(bootargs) console=ttyS0 panic=1\0" \
+	"add_net=setenv bootargs ${bootargs} ethaddr=${ethaddr} " \
+		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \
+	"add_misc=setenv bootargs ${bootargs} console=ttyS0 panic=1\0" \
 	"u-boot=/tftpboot/TRAB/u-boot.bin\0" \
-	"load=tftp C100000 $(u-boot)\0" \
+	"load=tftp C100000 ${u-boot}\0" \
 	"update=protect off 0 3FFFF;era 0 3FFFF;" \
-		"cp.b C100000 0 $(filesize);" \
+		"cp.b C100000 0 ${filesize};" \
 		"setenv filesize;saveenv\0" \
 	"loadfile=/tftpboot/TRAB/uImage\0" \
 	"loadaddr=C400000\0" \
-	"net_load=tftpboot $(loadaddr) $(loadfile)\0" \
+	"net_load=tftpboot ${loadaddr} ${loadfile}\0" \
 	"net_nfs=run net_load nfs_args add_net add_misc;bootm\0" \
 	"kernel_addr=000C0000\0" \
-	"flash_nfs=run nfs_args add_net add_misc;bootm $(kernel_addr)\0" \
+	"flash_nfs=run nfs_args add_net add_misc;bootm ${kernel_addr}\0" \
 	"mdm_init1=ATZ\0" \
 	"mdm_init2=ATS0=1\0" \
 	"mdm_flow_control=rts/cts\0"
@@ -384,10 +382,10 @@
 #define MTDIDS_DEFAULT		"nor0=0"
 
 /* production flash layout */
-#define MTDPARTS_DEFAULT	"mtdparts=0:32k(Firmware1)ro,"		\
+#define MTDPARTS_DEFAULT	"mtdparts=0:16k(Firmware1)ro,"		\
 						"16k(Env1),"		\
 						"16k(Env2),"		\
-						"320k(Firmware2)ro,"	\
+						"336k(Firmware2)ro,"	\
 						"896k(Kernel),"		\
 						"5376k(Root-FS),"	\
 						"1408k(JFFS2),"		\
@@ -404,7 +402,7 @@
 #endif
 
 /* timeout values are in ticks */
-#define CFG_FLASH_ERASE_TOUT	(2*CFG_HZ) /* Timeout for Flash Erase */
+#define CFG_FLASH_ERASE_TOUT	(15*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT	(2*CFG_HZ) /* Timeout for Flash Write */
 
 #define	CFG_ENV_IS_IN_FLASH	1