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

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>

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index b98d8b1dd55f50570d8230aeb43131d2eb7c55af..07fefecf748310921e3a2b8e88aa7e31cf833407 100644 (file)
--- 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 74ef47075c1f12acb159cd59e9f22dad426cfb93..e85e1b91fc2bc352d558c300692f7414c92a9ee9 100644 (file)
--- 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 9e408f4562a66f3eaf397b34f70219518c050714..ba0402d2978c7aaf2119e0fb465b0916282c9bb3 100644 (file)
--- 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 c7b38a2967142d9f0c5a77a04aac9d6ad7ab44c0..02a16ac0a66b00d6b4faf15863a87e284536e1c5 100644 (file)
--- 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 dd0654b700cbcc28c22e576988abd6faf06ed899..21e8bafc2c3d3d1efe42be38107e19a77614c2c1 100644 (file)
--- 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 cfe08c85647fe960153ca23832e193bb709ba497..38fb7c6c789dae1adc4189f9cf91ebcddff17113 100644 (file)
--- 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 f9ffa49ab628719a8f97d74ecd2e236201975afb..4ea040bc2288a148a4e108564b27fa5e7e728d0d 100644 (file)
--- 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 bec03d4bfcad7243f026bf98cdae015f567ef14c..784e7c0f8b33f3cc4bf617985dcea9d3efa66296 100644 (file)
--- 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 3e4aee4d007c38385ba4de01879eec7e0f6ab188..88fd7caa7a3babb645efa6e9a999137f71a15dfd 100644 (file)
--- 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 e29cfe7ad594c905e5021b820ea76275763785c8..5a85feb85353caf1e6be653d321c43234f4b4876 100644 (file)
--- 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 8c26613d0c0d81a9ea11ecbdfe7491e478b917d4..2ed8530b6d9968575005499a4939386de5d84720 100644 (file)
--- 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 465eaa2c17b976aee26f424d9acadd59df980a47..a3be0b51e60b91b08586960c7d51e76e1080ad27 100644 (file)
--- 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 b28236b381bb01534cb3a0ef36e0ad5ec914fe4e..21b26044a547bd48341ddf4cc0bdbc915c6f6909 100644 (file)
--- 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 88e50d7b3b99ac6c7495784440a95b1d41b66f9f..dcec9b039d865b3f6e3276e7b613327547c1b2a8 100644 (file)
--- 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 051252e6a62945d0026904735a2a22cb3b66db69..af237d9be0bd4b713f0afe86f50dfd95b051f24f 100644 (file)
--- 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 97e8bf1c50291db57a138a292fffefb7c1eec8ba..c3f10c75a8609ccbfe8055a7a5b6bf1d935c943f 100644 (file)
--- 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 9f679930dbb32aecd62d022a3897b487661123bf..5a6eb4a37d41dbb03cb1c3e15aebacfa124086f3 100644 (file)
--- 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 bec442d9839b1b3a7c61605fea6328e97a6da634..45dc3432db17125508a2e290217da59b6e272b8c 100644 (file)
--- 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 139175efa65bafe06bb1bdcabbb50f2ee671ba97..82f239117e388ea5116c0dd7a43f7012b68324de 100644 (file)
--- 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 b666964aaea7f5e5a4b1d679d7d550405ef99b83..893924b4bf9d1f6359791259cc2e467f3fb5745d 100644 (file)
--- 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 9d598fe070b8defbe319b7ef14be63a06ca5af37..ed41b2f509e9157f874fb5ce7897ebe9f15c4888 100644 (file)
--- 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 2498b3e650369ee9426ef444290b1299a6529756..d00c22f0d722818c91bb3ae5433c5bb6814b15db 100644 (file)
--- 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 92f1ee48bce8432277a311b67ee3a45e815e5f17..cc910deb64f68815e1c8deb49fe3120fdcbb36e2 100644 (file)
--- 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 a450c5b3d1ae58ab8c4dd0f92fb7a63c7d14462b..7db973676ba1cae0b421f9b316b43e574b09fdb2 100644 (file)
--- 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 7662169e76cbb25e263f54a733bbcfa87163eb74..851a7ad40aed2b7f724a55cf81fc37d7e4b3dfd7 100644 (file)
--- 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 b83660c74b95ab911e1730fb3b77b7ff26c5fbaf..f6e99aca777b9de497771ed577b59d9ba8611e6b 100644 (file)
--- 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 225308f62caf6a0966b11a381a62795b4d4e70f2..c9323f607403686ebd9d37adf341746b8d053a89 100644 (file)
--- 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 9538c0d854f336e3935a34574eb7421f237f8204..1e3571eb4dcc7dc95b0e2e9d686e1eadd2b2abb5 100644 (file)
--- 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"                                          \
        ""