Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace "run load; run update" with conditionalized "run load update".

Browse Source 
The latter version stops when "run load" fails for whatever reasons
rendering the combination *a lot* more secure.

Signed-off-by: Detlev Zundel <dzu@denx.de>
master
Detlev Zundel 17 years ago committed by Wolfgang Denk
parent 334fb53514
commit d8ab58b212
28 changed files with 29 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      include/configs/MPC8349EMDS.h
  2. 2
      include/configs/P3G4.h
  3. 2
      include/configs/TQM8272.h
  4. 2
      include/configs/TQM834x.h
  5. 2
      include/configs/TQM85xx.h
  6. 2
      include/configs/alpr.h
  7. 2
      include/configs/bamboo.h
  8. 2
      include/configs/bubinga.h
  9. 2
      include/configs/ebony.h
  10. 2
      include/configs/hcu4.h
  11. 2
      include/configs/hcu5.h
  12. 2
      include/configs/ixdpg425.h
  13. 2
      include/configs/katmai.h
  14. 2
      include/configs/korat.h
  15. 2
      include/configs/luan.h
  16. 2
      include/configs/lwmon5.h
  17. 2
      include/configs/ocotea.h
  18. 2
      include/configs/p3mx.h
  19. 2
      include/configs/p3p440.h
  20. 2
      include/configs/pcs440ep.h
  21. 2
      include/configs/pdnb3.h
  22. 2
      include/configs/sbc8349.h
  23. 2
      include/configs/sequoia.h
  24. 2
      include/configs/taihu.h
  25. 2
      include/configs/taishan.h
  26. 2
      include/configs/walnut.h
  27. 2
      include/configs/yosemite.h
  28. 4
      include/configs/yucca.h

2
include/configs/MPC8349EMDS.h
Unescape View File

@ -739,7 +739,7 @@
"load=tftp 100000 /tftpboot/mpc8349emds/u-boot.bin\0" \ "load=tftp 100000 /tftpboot/mpc8349emds/u-boot.bin\0" \
"update=protect off fe000000 fe03ffff; " \ "update=protect off fe000000 fe03ffff; " \
"era fe000000 fe03ffff; cp.b 100000 fe000000 ${filesize}\0" \ "era fe000000 fe03ffff; cp.b 100000 fe000000 ${filesize}\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"fdtaddr=400000\0" \ "fdtaddr=400000\0" \
"fdtfile=mpc8349emds.dtb\0" \ "fdtfile=mpc8349emds.dtb\0" \
"" ""

2
include/configs/P3G4.h
Unescape View File

@ -110,7 +110,7 @@
"update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;" \ "update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;" \
"cp.b 100000 fff00000 ${filesize};" \ "cp.b 100000 fff00000 ${filesize};" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/TQM8272.h
Unescape View File

@ -87,7 +87,7 @@
"cp.b 300000 40000000 40000;" \ "cp.b 300000 40000000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"cphwib=cp.b 4003fc00 33fc00 400\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" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/TQM834x.h
Unescape View File

@ -528,7 +528,7 @@ extern int tqm834x_num_flash_banks;
"load=tftp 100000 /tftpboot/tqm834x/u-boot.bin\0" \ "load=tftp 100000 /tftpboot/tqm834x/u-boot.bin\0" \
"update=protect off 80000000 8003ffff; " \ "update=protect off 80000000 8003ffff; " \
"era 80000000 8003ffff; cp.b 100000 80000000 40000\0" \ "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" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/TQM85xx.h
Unescape View File

@ -468,7 +468,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/alpr.h
Unescape View File

@ -166,7 +166,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"ethprime=ppc_4xx_eth3\0" \ "ethprime=ppc_4xx_eth3\0" \
"ethact=ppc_4xx_eth3\0" \ "ethact=ppc_4xx_eth3\0" \
"autoload=no\0" \ "autoload=no\0" \

2
include/configs/bamboo.h
Unescape View File

@ -276,7 +276,7 @@
"update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \ "update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \
"cp.b 100000 fffa0000 60000;" \ "cp.b 100000 fffa0000 60000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/bubinga.h
Unescape View File

@ -111,7 +111,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run net_nfs" #define CONFIG_BOOTCOMMAND "run net_nfs"

2
include/configs/ebony.h
Unescape View File

@ -184,7 +184,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/hcu4.h
Unescape View File

@ -192,7 +192,7 @@
"load=tftp 100000 hcu4/u-boot.bin\0" \ "load=tftp 100000 hcu4/u-boot.bin\0" \
"update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;" \ "update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;" \
"cp.b 100000 FFFB0000 50000\0" \ "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_rom=hcu4/hcu4_vx_rom\0" \
"vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0" \ "vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0" \
"vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}" \ "vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}" \

2
include/configs/hcu5.h
Unescape View File

@ -199,7 +199,7 @@
"load=tftp 100000 hcu5/u-boot.bin\0" \ "load=tftp 100000 hcu5/u-boot.bin\0" \
"update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;" \ "update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;" \
"cp.b 100000 FFFB0000 50000\0" \ "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_rom=hcu5/hcu5_vx_rom\0" \
"vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0" \ "vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0" \
"vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}" \ "vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}" \

2
include/configs/ixdpg425.h
Unescape View File

@ -168,7 +168,7 @@
"update=protect off 50000000 5003ffff;era 50000000 5003ffff;" \ "update=protect off 50000000 5003ffff;era 50000000 5003ffff;" \
"cp.b 100000 50000000 40000;" \ "cp.b 100000 50000000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run net_nfs" #define CONFIG_BOOTCOMMAND "run net_nfs"

2
include/configs/katmai.h
Unescape View File

@ -209,7 +209,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b ${fileaddr} fffc0000 ${filesize};" \ "cp.b ${fileaddr} fffc0000 ${filesize};" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"kozio=bootm ffc60000\0" \ "kozio=bootm ffc60000\0" \
"pciconfighost=1\0" \ "pciconfighost=1\0" \
"pcie_mode=RP:RP:RP\0" \ "pcie_mode=RP:RP:RP\0" \

2
include/configs/korat.h
Unescape View File

@ -202,7 +202,7 @@
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \ "load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \
"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \ "update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \
"cp.b 200000 FFFA0000 60000\0" \ "cp.b 200000 FFFA0000 60000\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/luan.h
Unescape View File

@ -182,7 +182,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/lwmon5.h
Unescape View File

@ -219,7 +219,7 @@
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \ "load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \
"update=protect off FFF80000 FFFFFFFF;era FFF80000 FFFFFFFF;" \ "update=protect off FFF80000 FFFFFFFF;era FFF80000 FFFFFFFF;" \
"cp.b 200000 FFF80000 80000\0" \ "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;" \ "lwe_env=tftp 200000 /tftpboot.dev/lwmon5/env_uboot.bin;" \
"autoscr 200000\0" \ "autoscr 200000\0" \
"" ""

2
include/configs/ocotea.h
Unescape View File

@ -199,7 +199,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/p3mx.h
Unescape View File

@ -219,7 +219,7 @@
"update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;" \ "update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;" \
"cp.b 100000 fff00000 40000;" \ "cp.b 100000 fff00000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"serverip=11.0.0.152\0" "serverip=11.0.0.152\0"
#if defined (CONFIG_P3M750) #if defined (CONFIG_P3M750)

2
include/configs/p3p440.h
Unescape View File

@ -147,7 +147,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"unlock=yes\0" \ "unlock=yes\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run net_nfs" #define CONFIG_BOOTCOMMAND "run net_nfs"

2
include/configs/pcs440ep.h
Unescape View File

@ -172,7 +172,7 @@
"load=tftp 100000 /tftpboot/pcs440ep/u-boot.bin\0" \ "load=tftp 100000 /tftpboot/pcs440ep/u-boot.bin\0" \
"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \ "update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \
"cp.b 100000 FFFA0000 60000\0" \ "cp.b 100000 FFFA0000 60000\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/pdnb3.h
Unescape View File

@ -170,7 +170,7 @@
"update=protect off 50000000 5007dfff;era 50000000 5007dfff;" \ "update=protect off 50000000 5007dfff;era 50000000 5007dfff;" \
"cp.b 100000 50000000 ${filesize};" \ "cp.b 100000 50000000 ${filesize};" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"ipaddr=10.0.0.233\0" \ "ipaddr=10.0.0.233\0" \
"serverip=10.0.0.152\0" \ "serverip=10.0.0.152\0" \
"netmask=255.255.0.0\0" \ "netmask=255.255.0.0\0" \

2
include/configs/sbc8349.h
Unescape View File

@ -688,7 +688,7 @@
"load=tftp 100000 /tftpboot/sbc8349/u-boot.bin\0" \ "load=tftp 100000 /tftpboot/sbc8349/u-boot.bin\0" \
"update=protect off fff00000 fff3ffff; " \ "update=protect off fff00000 fff3ffff; " \
"era fff00000 fff3ffff; cp.b 100000 fff00000 ${filesize}\0" \ "era fff00000 fff3ffff; cp.b 100000 fff00000 ${filesize}\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"fdtaddr=400000\0" \ "fdtaddr=400000\0" \
"fdtfile=sbc8349.dtb\0" \ "fdtfile=sbc8349.dtb\0" \
"" ""

2
include/configs/sequoia.h
Unescape View File

@ -284,7 +284,7 @@
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \ "load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \
"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \ "update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \
"cp.b 200000 FFFA0000 60000\0" \ "cp.b 200000 FFFA0000 60000\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/taihu.h
Unescape View File

@ -99,7 +99,7 @@
"load=tftp 200000 /tftpboot/taihu/u-boot.bin\0" \ "load=tftp 200000 /tftpboot/taihu/u-boot.bin\0" \
"update=protect off FFFC0000 FFFFFFFF;era FFFC0000 FFFFFFFF;" \ "update=protect off FFFC0000 FFFFFFFF;era FFFC0000 FFFFFFFF;" \
"cp.b 200000 FFFC0000 40000\0" \ "cp.b 200000 FFFC0000 40000\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

2
include/configs/taishan.h
Unescape View File

@ -194,7 +194,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"fixedip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):" \ "fixedip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):" \
"$(gatewayip):$(netmask):$(hostname):$(netdev):off panic=1\0" \ "$(gatewayip):$(netmask):$(hostname):$(netdev):off panic=1\0" \
"dhcp=setenv bootargs $(bootargs) ip=dhcp\0" \ "dhcp=setenv bootargs $(bootargs) ip=dhcp\0" \

2
include/configs/walnut.h
Unescape View File

@ -73,7 +73,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \ "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \ "cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run net_nfs" #define CONFIG_BOOTCOMMAND "run net_nfs"

2
include/configs/yosemite.h
Unescape View File

@ -209,7 +209,7 @@
"update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \ "update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
"cp.b 200000 fff80000 80000;" \ "cp.b 200000 fff80000 80000;" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"" ""
#define CONFIG_BOOTCOMMAND "run flash_self" #define CONFIG_BOOTCOMMAND "run flash_self"

4
include/configs/yucca.h
Unescape View File

@ -175,7 +175,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \
"bootm\0" \ "bootm\0" \
"rootpath=/opt/eldk/ppc_4xx\0" \ "rootpath=/opt/eldk/ppc_4xx\0" \
"bootfile=yucca/uImage\0" \ "bootfile=yucca/uImage\0" \
"kernel_addr=E7F10000\0" \ "kernel_addr=E7F10000\0" \
"ramdisk_addr=E7F20000\0" \ "ramdisk_addr=E7F20000\0" \
@ -184,7 +184,7 @@
"update=protect off 2:4-7;era 2:4-7;" \ "update=protect off 2:4-7;era 2:4-7;" \
"cp.b ${fileaddr} FFFB0000 ${filesize};" \ "cp.b ${fileaddr} FFFB0000 ${filesize};" \
"setenv filesize;saveenv\0" \ "setenv filesize;saveenv\0" \
"upd=run load;run update\0" \ "upd=run load update\0" \
"pciconfighost=1\0" \ "pciconfighost=1\0" \
"pcie_mode=RP:EP:EP\0" \ "pcie_mode=RP:EP:EP\0" \
"" ""

Write Preview
Loading…
Cancel
Save