diff options
28 files changed, 29 insertions, 29 deletions
| diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index b98d8b1dd..07fefecf7 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -739,7 +739,7 @@  	"load=tftp 100000 /tftpboot/mpc8349emds/u-boot.bin\0"		\  	"update=protect off fe000000 fe03ffff; "			\  		"era fe000000 fe03ffff; cp.b 100000 fe000000 ${filesize}\0"	\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"fdtaddr=400000\0"						\  	"fdtfile=mpc8349emds.dtb\0"					\  	"" diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 74ef47075..e85e1b91f 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -110,7 +110,7 @@  	"update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;"	\  		"cp.b 100000 fff00000 ${filesize};"			\  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h index 9e408f456..ba0402d29 100644 --- a/include/configs/TQM8272.h +++ b/include/configs/TQM8272.h @@ -87,7 +87,7 @@  		"cp.b 300000 40000000 40000;"			        \  		"setenv filesize;saveenv\0"				\  	"cphwib=cp.b 4003fc00 33fc00 400\0"				\ -	"upd=run load;run cphwib;run update\0"				\ +	"upd=run load cphwib update\0"					\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index c7b38a296..02a16ac0a 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -528,7 +528,7 @@ extern int tqm834x_num_flash_banks;  	"load=tftp 100000 /tftpboot/tqm834x/u-boot.bin\0"		\  	"update=protect off 80000000 8003ffff; "			\  		"era 80000000 8003ffff; cp.b 100000 80000000 40000\0"	\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h index dd0654b70..21e8bafc2 100644 --- a/include/configs/TQM85xx.h +++ b/include/configs/TQM85xx.h @@ -468,7 +468,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/alpr.h b/include/configs/alpr.h index cfe08c856..38fb7c6c7 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -166,7 +166,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"ethprime=ppc_4xx_eth3\0"					\  	"ethact=ppc_4xx_eth3\0"						\  	"autoload=no\0"							\ diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index f9ffa49ab..4ea040bc2 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -276,7 +276,7 @@  	"update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;"	\  		"cp.b 100000 fffa0000 60000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index bec03d4bf..784e7c0f8 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -111,7 +111,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run net_nfs" diff --git a/include/configs/ebony.h b/include/configs/ebony.h index 3e4aee4d0..88fd7caa7 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -184,7 +184,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index e29cfe7ad..5a85feb85 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -192,7 +192,7 @@  	"load=tftp 100000 hcu4/u-boot.bin\0"				\  	"update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;"	\  		"cp.b 100000 FFFB0000 50000\0"			        \ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"vx_rom=hcu4/hcu4_vx_rom\0"					\  	"vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0"		\  	"vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}"	\ diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index 8c26613d0..2ed8530b6 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -199,7 +199,7 @@  		"load=tftp 100000 hcu5/u-boot.bin\0"		 	\  	"update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;"	\  		"cp.b 100000 FFFB0000 50000\0"			        \ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"vx_rom=hcu5/hcu5_vx_rom\0"					\  	"vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0"		\  	"vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}"	\ diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h index 465eaa2c1..a3be0b51e 100644 --- a/include/configs/ixdpg425.h +++ b/include/configs/ixdpg425.h @@ -168,7 +168,7 @@  	"update=protect off 50000000 5003ffff;era 50000000 5003ffff;"	\  		"cp.b 100000 50000000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run net_nfs" diff --git a/include/configs/katmai.h b/include/configs/katmai.h index b28236b38..21b26044a 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -209,7 +209,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b ${fileaddr} fffc0000 ${filesize};"		\  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"kozio=bootm ffc60000\0"					\  	"pciconfighost=1\0"						\  	"pcie_mode=RP:RP:RP\0"						\ diff --git a/include/configs/korat.h b/include/configs/korat.h index 88e50d7b3..dcec9b039 100644 --- a/include/configs/korat.h +++ b/include/configs/korat.h @@ -202,7 +202,7 @@  	"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0"		\  	"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;"	\  		"cp.b 200000 FFFA0000 60000\0"			        \ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/luan.h b/include/configs/luan.h index 051252e6a..af237d9be 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -182,7 +182,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 97e8bf1c5..c3f10c75a 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -219,7 +219,7 @@  	"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0"		\  	"update=protect off FFF80000 FFFFFFFF;era FFF80000 FFFFFFFF;"	\  		"cp.b 200000 FFF80000 80000\0"			        \ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"lwe_env=tftp 200000 /tftpboot.dev/lwmon5/env_uboot.bin;"	\  		"autoscr 200000\0"					\  	"" diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index 9f679930d..5a6eb4a37 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -199,7 +199,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index bec442d98..45dc3432d 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -219,7 +219,7 @@  	"update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;"	\  		"cp.b 100000 fff00000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"serverip=11.0.0.152\0"  #if defined (CONFIG_P3M750) diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index 139175efa..82f239117 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -147,7 +147,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"unlock=yes\0"							\  	""  #define CONFIG_BOOTCOMMAND	"run net_nfs" diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index b666964aa..893924b4b 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -172,7 +172,7 @@  	"load=tftp 100000 /tftpboot/pcs440ep/u-boot.bin\0"		\  	"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;"	\  		"cp.b 100000 FFFA0000 60000\0"			        \ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index 9d598fe07..ed41b2f50 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -170,7 +170,7 @@  	"update=protect off 50000000 5007dfff;era 50000000 5007dfff;"	\  		"cp.b 100000 50000000 ${filesize};"			\  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"ipaddr=10.0.0.233\0"						\  	"serverip=10.0.0.152\0"						\  	"netmask=255.255.0.0\0"					\ diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 2498b3e65..d00c22f0d 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -688,7 +688,7 @@  	"load=tftp 100000 /tftpboot/sbc8349/u-boot.bin\0"		\  	"update=protect off fff00000 fff3ffff; "			\  		"era fff00000 fff3ffff; cp.b 100000 fff00000 ${filesize}\0"	\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"fdtaddr=400000\0"						\  	"fdtfile=sbc8349.dtb\0"					\  	"" diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 92f1ee48b..cc910deb6 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -284,7 +284,7 @@  	"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0"		\  	"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;"	\  		"cp.b 200000 FFFA0000 60000\0"			        \ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/taihu.h b/include/configs/taihu.h index a450c5b3d..7db973676 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -99,7 +99,7 @@  	"load=tftp 200000 /tftpboot/taihu/u-boot.bin\0"			\  	"update=protect off FFFC0000 FFFFFFFF;era FFFC0000 FFFFFFFF;"	\  		"cp.b 200000 FFFC0000 40000\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/taishan.h b/include/configs/taishan.h index 7662169e7..851a7ad40 100644 --- a/include/configs/taishan.h +++ b/include/configs/taishan.h @@ -194,7 +194,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"fixedip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):" \  	"$(gatewayip):$(netmask):$(hostname):$(netdev):off panic=1\0"	\  	"dhcp=setenv bootargs $(bootargs) ip=dhcp\0"			\ diff --git a/include/configs/walnut.h b/include/configs/walnut.h index b83660c74..f6e99aca7 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -73,7 +73,7 @@  	"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"	\  		"cp.b 100000 fffc0000 40000;"				\  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run net_nfs" diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 225308f62..c9323f607 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -209,7 +209,7 @@  	"update=protect off fff80000 ffffffff;era fff80000 ffffffff;"	\  		"cp.b 200000 fff80000 80000;"			        \  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	""  #define CONFIG_BOOTCOMMAND	"run flash_self" diff --git a/include/configs/yucca.h b/include/configs/yucca.h index 9538c0d85..1e3571eb4 100644 --- a/include/configs/yucca.h +++ b/include/configs/yucca.h @@ -175,7 +175,7 @@  		"bootm ${kernel_addr} ${ramdisk_addr}\0"		\  	"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \  		"bootm\0"						\ -	"rootpath=/opt/eldk/ppc_4xx\0"				\ +	"rootpath=/opt/eldk/ppc_4xx\0"					\  	"bootfile=yucca/uImage\0"					\  	"kernel_addr=E7F10000\0"					\  	"ramdisk_addr=E7F20000\0"					\ @@ -184,7 +184,7 @@  	"update=protect off 2:4-7;era 2:4-7;"				\  		"cp.b ${fileaddr} FFFB0000 ${filesize};"		\  		"setenv filesize;saveenv\0"				\ -	"upd=run load;run update\0"					\ +	"upd=run load update\0"						\  	"pciconfighost=1\0"						\  	"pcie_mode=RP:EP:EP\0"						\  	"" |