From: Detlev Zundel <dzu@denx.de>
Date: Thu, 3 Apr 2008 12:18:48 +0000 (+0200)
Subject: mgcoge, mgsuv: realign CONFIG_EXTRA_ENV_SETTING
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c61e033d6e8abb7b4060ee36060961e1399f6079;p=project%2Fbcm63xx%2Fu-boot.git

mgcoge, mgsuv: realign CONFIG_EXTRA_ENV_SETTING

Signed-off-by: Detlev Zundel <dzu@denx.de>
---

diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index f0fed06853..2924acc7a3 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -89,35 +89,35 @@
 /*
  * Default environment settings
  */
-#define CONFIG_EXTRA_ENV_SETTINGS					\
-	"netdev=eth0\0"							\
-	"u-boot_addr=100000\0"						\
-	"kernel_addr=200000\0"						\
-	"fdt_addr=400000\0"						\
-	"rootpath=/opt/eldk-4.2/ppc_82xx\0"				\
-	"u-boot=/tftpboot/mgcoge/u-boot.bin\0"				\
-	"bootfile=/tftpboot/mgcoge/uImage\0"				\
-	"fdt_file=/tftpboot/mgcoge/mgcoge.dtb\0"			\
-	"load=tftp ${u-boot_addr} ${u-boot}\0"				\
-	"update=prot off fe000000 fe03ffff; era fe000000 fe03ffff; "	\
-		"cp.b ${u-boot_addr} fe000000 ${filesize};"		\
-		"prot on fe000000 fe03ffff\0"				\
-	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
-	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
-		"nfsroot=${serverip}:${rootpath}\0"			\
+#define CONFIG_EXTRA_ENV_SETTINGS						\
+	"netdev=eth0\0"								\
+	"u-boot_addr=100000\0"							\
+	"kernel_addr=200000\0"							\
+	"fdt_addr=400000\0"							\
+	"rootpath=/opt/eldk-4.2/ppc_82xx\0"					\
+	"u-boot=/tftpboot/mgcoge/u-boot.bin\0"					\
+	"bootfile=/tftpboot/mgcoge/uImage\0"					\
+	"fdt_file=/tftpboot/mgcoge/mgcoge.dtb\0"				\
+	"load=tftp ${u-boot_addr} ${u-boot}\0"					\
+	"update=prot off fe000000 fe03ffff; era fe000000 fe03ffff; "		\
+		"cp.b ${u-boot_addr} fe000000 ${filesize};"			\
+		"prot on fe000000 fe03ffff\0"					\
+	"ramargs=setenv bootargs root=/dev/ram rw\0"				\
+	"nfsargs=setenv bootargs root=/dev/nfs rw "				\
+		"nfsroot=${serverip}:${rootpath}\0"				\
 	"addcons=setenv bootargs ${bootargs} console=ttyCPM0,${baudrate}\0"	\
-	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"		\
-	"addip=setenv bootargs ${bootargs} "				\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:"		\
-		"${netmask}:${hostname}:${netdev}:off panic=1\0"	\
-	"net_nfs=tftp ${kernel_addr} ${bootfile}; "			\
-		"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcons;"\
-		"bootm ${kernel_addr} - ${fdt_addr}\0"			\
-	"net_self=tftp ${kernel_addr} ${bootfile}; "			\
-		"tftp ${fdt_addr} ${fdt_file}; "			\
-		"tftp ${ramdisk_addr} ${ramdisk_file}; "		\
-		"run ramargs addip; "					\
-		"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"	\
+	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"			\
+	"addip=setenv bootargs ${bootargs} "					\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:"			\
+		"${netmask}:${hostname}:${netdev}:off panic=1\0"		\
+	"net_nfs=tftp ${kernel_addr} ${bootfile}; "				\
+		"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcons;"	\
+		"bootm ${kernel_addr} - ${fdt_addr}\0"				\
+	"net_self=tftp ${kernel_addr} ${bootfile}; "				\
+		"tftp ${fdt_addr} ${fdt_file}; "				\
+		"tftp ${ramdisk_addr} ${ramdisk_file}; "			\
+		"run ramargs addip; "						\
+		"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"		\
 	""
 #define CONFIG_BOOTCOMMAND	"run net_nfs"
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index aa026d9ec9..9cbc9ccf93 100644
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -59,32 +59,32 @@
 
 #undef	CONFIG_BOOTARGS
 
-#define CONFIG_EXTRA_ENV_SETTINGS					\
-	"netdev=eth0\0"							\
+#define CONFIG_EXTRA_ENV_SETTINGS						\
+	"netdev=eth0\0"								\
 	"addcons=setenv bootargs ${bootargs} console=ttyCPM0,${baudrate}\0"	\
-	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
-		"nfsroot=${serverip}:${rootpath}\0"			\
-	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
-	"addip=setenv bootargs ${bootargs} "				\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
-		":${hostname}:${netdev}:off panic=1\0"			\
-	"flash_nfs=run nfsargs addip;"					\
-		"bootm ${kernel_addr}\0"				\
-	"flash_self=run ramargs addip;"					\
-		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\
-	"net_nfs=tftp ${kernel_addr} ${bootfile}; "			\
-		"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcons;"\
-		"bootm ${kernel_addr} - ${fdt_addr}\0"			\
-	"rootpath=/opt/eldk/ppc_8xx\0"					\
-	"bootfile=/tftpboot/mgsuvd/uImage\0"				\
-	"fdt_addr=400000\0"						\
-	"kernel_addr=200000\0"						\
-	"fdt_file=/tftpboot/mgsuvd/mgsuvd.dtb\0"			\
-	"load=tftp 200000 ${u-boot}\0"					\
-	"update=protect off f0000000 +${filesize};"			\
-		"erase f0000000 +${filesize};"				\
-		"cp.b 200000 f0000000 ${filesize};"			\
-		"protect on f0000000 +${filesize}\0"			\
+	"nfsargs=setenv bootargs root=/dev/nfs rw "				\
+		"nfsroot=${serverip}:${rootpath}\0"				\
+	"ramargs=setenv bootargs root=/dev/ram rw\0"				\
+	"addip=setenv bootargs ${bootargs} "					\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"		\
+		":${hostname}:${netdev}:off panic=1\0"				\
+	"flash_nfs=run nfsargs addip;"						\
+		"bootm ${kernel_addr}\0"					\
+	"flash_self=run ramargs addip;"						\
+		"bootm ${kernel_addr} ${ramdisk_addr}\0"			\
+	"net_nfs=tftp ${kernel_addr} ${bootfile}; "				\
+		"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcons;"	\
+		"bootm ${kernel_addr} - ${fdt_addr}\0"				\
+	"rootpath=/opt/eldk/ppc_8xx\0"						\
+	"bootfile=/tftpboot/mgsuvd/uImage\0"					\
+	"fdt_addr=400000\0"							\
+	"kernel_addr=200000\0"							\
+	"fdt_file=/tftpboot/mgsuvd/mgsuvd.dtb\0"				\
+	"load=tftp 200000 ${u-boot}\0"						\
+	"update=protect off f0000000 +${filesize};"				\
+		"erase f0000000 +${filesize};"					\
+		"cp.b 200000 f0000000 ${filesize};"				\
+		"protect on f0000000 +${filesize}\0"				\
 	""
 #define CONFIG_BOOTCOMMAND	"run flash_self"