]> git.sur5r.net Git - u-boot/commitdiff
Change all '$(...)' variable references into '${...}'
authorWolfgang Denk <wd@pollux.(none)>
Sun, 20 Nov 2005 20:40:11 +0000 (21:40 +0100)
committerWolfgang Denk <wd@pollux.(none)>
Sun, 20 Nov 2005 20:40:11 +0000 (21:40 +0100)
which makes the environment compatible with the hush shell.
WARNING: Support for the old '$(...)' syntax will be
discontinued in a later version.

116 files changed:
CHANGELOG
README
board/LEOX/elpt860/README.LEOX
board/RPXlite_dw/README
board/esd/hh405/hh405.c
board/esd/plu405/plu405.c
board/fads/fads.h
board/hymod/global_env
board/lwmon/README.keybd
board/mousse/README
board/siemens/common/README
doc/README.Sandpoint8240
doc/README.dk1s10
include/configs/AMX860.h
include/configs/APC405.h
include/configs/BAB7xx.h
include/configs/CCM.h
include/configs/CPU86.h
include/configs/CPU87.h
include/configs/DB64360.h
include/configs/DB64460.h
include/configs/ELPPC.h
include/configs/ELPT860.h
include/configs/ETX094.h
include/configs/FADS823.h
include/configs/G2000.h
include/configs/GEN860T.h
include/configs/GENIETV.h
include/configs/HMI10.h
include/configs/IAD210.h
include/configs/ICU862.h
include/configs/IDS8247.h
include/configs/IP860.h
include/configs/IceCube.h
include/configs/KUP4K.h
include/configs/KUP4X.h
include/configs/MHPC.h
include/configs/MPC8266ADS.h
include/configs/MVBLUE.h
include/configs/MVS1.h
include/configs/NC650.h
include/configs/NSCU.h
include/configs/P3G4.h
include/configs/PM520.h
include/configs/PM826.h
include/configs/PM828.h
include/configs/PN62.h
include/configs/QS860T.h
include/configs/R360MPI.h
include/configs/RBC823.h
include/configs/RPXClassic.h
include/configs/RPXlite.h
include/configs/RPXlite_DW.h
include/configs/RRvision.h
include/configs/SCM.h
include/configs/SM850.h
include/configs/Sandpoint8240.h
include/configs/TOP5200.h
include/configs/TOP860.h
include/configs/TQM5200.h
include/configs/TQM823L.h
include/configs/TQM823M.h
include/configs/TQM8260.h
include/configs/TQM834x.h
include/configs/TQM850L.h
include/configs/TQM850M.h
include/configs/TQM855L.h
include/configs/TQM855M.h
include/configs/TQM860L.h
include/configs/TQM860M.h
include/configs/TQM862L.h
include/configs/TQM862M.h
include/configs/TQM866M.h
include/configs/Total5200.h
include/configs/VoVPN-GW.h
include/configs/aev.h
include/configs/atc.h
include/configs/bamboo.h
include/configs/bubinga.h
include/configs/c2mon.h
include/configs/canmb.h
include/configs/cmc_pu2.h
include/configs/cpci5200.h
include/configs/csb272.h
include/configs/csb472.h
include/configs/dbau1x00.h
include/configs/debris.h
include/configs/ebony.h
include/configs/hermes.h
include/configs/hmi1001.h
include/configs/incaip.h
include/configs/inka4x0.h
include/configs/o2dnt.h
include/configs/ocotea.h
include/configs/pb1x00.h
include/configs/pcu_e.h
include/configs/pf5200.h
include/configs/ppmc8260.h
include/configs/purple.h
include/configs/quantum.h
include/configs/rmu.h
include/configs/sacsng.h
include/configs/sbc405.h
include/configs/sbc8260.h
include/configs/spieval.h
include/configs/svm_sc8xx.h
include/configs/tb0229.h
include/configs/trab.h
include/configs/uc100.h
include/configs/utx8245.h
include/configs/v37.h
include/configs/voiceblue.h
include/configs/walnut.h
include/configs/yellowstone.h
include/configs/yosemite.h
tools/env/fw_env.h

index dded6c14608cf8f98f6fcaa2a7687846bb77a646..44bbca553159eb604f08c9691e478650d04a54ed 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Change all '$(...)' variable references into '${...}'
+  which makes the environment compatible with the hush shell.
+  WARNING: Support for the old '$(...)' syntax will be
+  discontinued in a later version.
+
 * Minor changes to init flags in TQM834x PCI.
 
 * Fix Bamboo DDR SDRAM initialization (problem with onboard SDRAM)
diff --git a/README b/README
index b0e1fb27c492dc477a6fc9a23dba3f0b86207a28..86db61b5298a39e5c0fc3fd72b81645849a1d61f 100644 (file)
--- a/README
+++ b/README
@@ -1377,7 +1377,7 @@ The following options need to be configured:
                remaining RAM in a form that can be passed as boot
                argument to Linux, for instance like that:
 
-                       setenv bootargs ... mem=\$(mem)
+                       setenv bootargs ... mem=\${mem}
                        saveenv
 
                This way you can tell Linux not to use this memory,
@@ -2546,10 +2546,10 @@ Old, simple command line parser:
 
 - supports environment variables (through setenv / saveenv commands)
 - several commands on one line, separated by ';'
-- variable substitution using "... $(name) ..." syntax
+- variable substitution using "... ${name} ..." syntax
 - special characters ('$', ';') can be escaped by prefixing with '\',
   for example:
-       setenv bootcmd bootm \$(address)
+       setenv bootcmd bootm \${address}
 - You can also escape text by enclosing in single apostrophes, for example:
        setenv addip 'setenv bootargs $bootargs ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname::off'
 
index 23bc30287899c08cdbcf3f6623d9fa5ad6c6e7f0..9052b097b427492454034e921d362d2c1966e4ea 100644 (file)
@@ -124,9 +124,9 @@ nfsserverip=192.168.0.1
 preboot=echo;echo Type "run nfsboot" to mount root filesystem over NFS;echo
 gatewayip=192.168.0.1
 ramargs=setenv bootargs root=/dev/ram rw
-rootargs=setenv rootpath /tftp/$(ipaddr)
-nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(nfsserverip):$(rootpath)
-addip=setenv bootargs $(bootargs) ip=$(ipaddr):$(nfsserverip):$(gatewayip):$(netmask):$(hostname):eth0:
+rootargs=setenv rootpath /tftp/${ipaddr}
+nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${nfsserverip}:${rootpath}
+addip=setenv bootargs ${bootargs} ip=${ipaddr}:${nfsserverip}:${gatewayip}:${netmask}:${hostname}:eth0:
 ramboot=tftp 400000 /home/leox/pMulti;run ramargs;bootm
 nfsboot=tftp 400000 /home/leox/uImage;run rootargs;run nfsargs;run addip;bootm
 bootcmd=run ramboot
index e88f9aa55ddd6ac84f347673bd4d1bdbd45617c8..28bcb318e8bb650e3ba0807178e02df97b7c30b3 100644 (file)
@@ -94,8 +94,8 @@ like[include/configs/RPXlite.h] :
 
 #define CONFIG_BOOTCOMMAND                                                      \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 This is enough for kernel NFS test. But as debug process goes on, you would expect
index 5c0d070a7f669816798bf1129b51dfd8682f0541..3158803f0c7c3cb126d4dd6b2a642f8201549e2e 100644 (file)
@@ -263,7 +263,7 @@ unsigned char logo_bmp_1024[] =
 au_image_t au_image[] = {
        {"hh405/preinst.img", 0, -1, AU_SCRIPT},
        {"hh405/u-boot.img", 0xfff80000, 0x00080000, AU_FIRMWARE},
-       {"hh405/pImage_$(bd_type)", 0x00000000, 0x00100000, AU_NAND},
+       {"hh405/pImage_${bd_type}", 0x00000000, 0x00100000, AU_NAND},
        {"hh405/pImage.initrd", 0x00100000, 0x00200000, AU_NAND},
        {"hh405/yaffsmt2.img", 0x00300000, 0x01c00000, AU_NAND},
        {"hh405/postinst.img", 0, 0, AU_SCRIPT},
index 16f2360dccd77c9d60eb14c13ca6be786897b04d..5b9d0631f8e782140e4fd0a9e5f0c5d68f0a0cb5 100644 (file)
@@ -54,7 +54,7 @@ const unsigned char fpgadata[] =
 au_image_t au_image[] = {
        {"plu405/preinst.img", 0, -1, AU_SCRIPT},
        {"plu405/u-boot.img", 0xfffc0000, 0x00040000, AU_FIRMWARE},
-       {"plu405/pImage_$(bd_type)", 0x00000000, 0x00100000, AU_NAND},
+       {"plu405/pImage_${bd_type}", 0x00000000, 0x00100000, AU_NAND},
        {"plu405/pImage.initrd", 0x00100000, 0x00200000, AU_NAND},
        {"plu405/yaffsmt2.img", 0x00300000, 0x01c00000, AU_NAND},
        {"plu405/postinst.img", 0, 0, AU_SCRIPT},
index aff1b7efec2320045988e9a7e4813524ff8b6846..1127c7ff726f43330af519ad489a0f020d198647 100644 (file)
@@ -58,8 +58,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
     "dhcp;"                                                                    \
-    "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "                \
-    "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"       \
+    "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "                \
+    "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"       \
     "bootm"
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
index 43cab1d1ce7de5edf9684af3faf609f05a6e5caf..f61d0807dfb772f480fdd40999f10e0fa4fe698a 100644 (file)
@@ -135,26 +135,26 @@ newboot=run fetchboot eraseboot copyboot cmpboot
 
 fetchlinux=tftp 100000 /hymod/linux.bin
 eraselinux=erase 1:2-4
-copylinux=cp.b 100000 40080000 $(filesize)
-cmplinux=cmp.b 100000 40080000 $(filesize)
+copylinux=cp.b 100000 40080000 ${filesize}
+cmplinux=cmp.b 100000 40080000 ${filesize}
 newlinux=run fetchlinux eraselinux copylinux cmplinux
 
 fetchaltlinux=tftp 100000 /hymod/altlinux.bin
 erasealtlinux=erase 1:5-7
-copyaltlinux=cp.b 100000 40140000 $(filesize)
-cmpaltlinux=cmp.b 100000 40140000 $(filesize)
+copyaltlinux=cp.b 100000 40140000 ${filesize}
+cmpaltlinux=cmp.b 100000 40140000 ${filesize}
 newaltlinux=run fetchaltlinux erasealtlinux copyaltlinux cmpaltlinux
 
 fetchroot=tftp 100000 /hymod/root.bin
 eraseroot=erase 1:8-47
-copyroot=cp.b 100000 40200000 $(filesize)
-cmproot=cmp.b 100000 40200000 $(filesize)
+copyroot=cp.b 100000 40200000 ${filesize}
+cmproot=cmp.b 100000 40200000 ${filesize}
 newroot=run fetchroot eraseroot copyroot cmproot
 
 fetchard=tftp 100000 /hymod/apprd.bin
 eraseard=erase 1:48-63
-copyard=cp.b 100000 40c00000 $(filesize)
-cmpard=cmp.b 100000 40c00000 $(filesize)
+copyard=cp.b 100000 40c00000 ${filesize}
+cmpard=cmp.b 100000 40c00000 ${filesize}
 newapprd=run fetchard eraseard copyard cmpard
 
 # pass above map to linux mtd driver
index 788c8644514332ad33a38bc6e5806ad97f030a8e..54f0aeb81fbd98fb658897bef1db9b9e9152e30a 100644 (file)
@@ -100,10 +100,10 @@ In U-Boot werden folgende Environment-Variablen gesetzt und abgespei-
 chert:
 
 (1)    => setenv magic_keys 01234#X
-(2)    => setenv key_cmd# setenv addfb setenv bootargs \\$(bootargs) console=tty0 console=ttyS1,\\$(baudrate)
-(3)    => setenv nfsargs setenv bootargs root=/dev/nfs rw nfsroot=\$(serverip):\$(rootpath)
-(4)    => setenv addip setenv bootargs \$(bootargs) ip=\$(ipaddr):\$(serverip):\$(gatewayip):\$(netmask):\$(hostname)::off panic=1
-(5)    => setenv addfb setenv bootargs \$(bootargs) console=ttyS1,\$(baudrate)
+(2)    => setenv key_cmd# setenv addfb setenv bootargs \\${bootargs} console=tty0 console=ttyS1,\\${baudrate}
+(3)    => setenv nfsargs setenv bootargs root=/dev/nfs rw nfsroot=\${serverip}:\${rootpath}
+(4)    => setenv addip setenv bootargs \${bootargs} ip=\${ipaddr}:\${serverip}:\${gatewayip}:\${netmask}:\${hostname}::off panic=1
+(5)    => setenv addfb setenv bootargs \${bootargs} console=ttyS1,\${baudrate}
 (6)    => setenv bootcmd bootp\;run nfsargs\;run addip\;run addfb\;bootm
 
 Hierbei wird die Linux Commandline (in der Variablen  "bootargs")  im
index 61aacce5db0747e9b14006cecbfdc8015d0655ca..d5dda7a8e734e4bf1c0b09bc8b410725d8dc70a0 100644 (file)
@@ -132,7 +132,7 @@ pins 1-2 and follow the procedure below to FLASH a bootrom
 tftp 100000 u-boot.bin
 protect off FFF00000 FFF7FFFF
 erase FFF00000 FFF7FFFF
-cp.b 100000 FFF00000 \$(filesize)\
+cp.b 100000 FFF00000 \${filesize}\
 
 
 Here is an example:
@@ -169,7 +169,7 @@ into the onboard FLASH region (AMD29LV160DB 2MB FLASH):
 tftp 100000 u-boot.bin
 protect off FFF80000 FFFFFFFF
 erase FFF80000 FFFFFFFF
-cp.b 100000 FFF80000 \$(filesize)\
+cp.b 100000 FFF80000 \${filesize}\
 
 
 C. FLASH KERNEL REGION (960KB)
@@ -183,7 +183,7 @@ The following commands will FLASH a kernel image to 0xffe10000
 tftp 100000 vmlinux.img
 protect off FFE10000 FFEFFFFF
 erase FFE10000 FFEFFFFF
-cp.b 100000 FFE10000 \$(filesize)\
+cp.b 100000 FFE10000 \${filesize}\
 reset
 
 Here is an example:
index d781903840416fb2fe50e2ffa6a0fb4a616adfe6..7f1c8cd62db9c36ae0bb0302f2eb1f50b2ad0444 100644 (file)
@@ -19,7 +19,7 @@ Die MTD-Partitionierung kann nun mittels "bootargs" ueber-
 geben werden:
 
   => printenv addmtd
-  addmtd=setenv bootargs $(bootargs)
+  addmtd=setenv bootargs ${bootargs}
     mtdparts=0:256k(U-Boot)ro,768k(Kernel),-(Rest)\;1:-(myJFFS2)
 
 Die Portierung auf SMC ist natuerlich noch nicht getestet.
index b506c01ce1c0813128218f46d6e00eb4fee25a8f..a41b69acedb8817fe1ddd1eca2ed50696879dd0e 100644 (file)
@@ -253,7 +253,7 @@ bootfile=telemetry
 hostname=sp1
 ethaddr=00:03:47:97:E4:6B
 load=tftp 100000 u-boot.bin
-update=protect off all;era FFF00000 FFF3FFFF;cp.b 100000 FFF00000 $(filesize);saveenv
+update=protect off all;era FFF00000 FFF3FFFF;cp.b 100000 FFF00000 ${filesize};saveenv
 filesize=1f304
 gatewayip=145.17.228.1
 netmask=255.255.255.0
@@ -308,7 +308,7 @@ Protected 1 sectors
 You can put these commands into some environment variables;
 
 => setenv load tftp 100000 u-boot.bin
-=> setenv update protect off all\;era FFF00000 FFF3FFFF\;cp.b 100000 FFF00000 \$(filesize)\;saveenv
+=> setenv update protect off all\;era FFF00000 FFF3FFFF\;cp.b 100000 FFF00000 \${filesize}\;saveenv
 => saveenv
 
 Then you just have to type "run load" then "run update"
index bb8375a6b81316224b804caba22df486660d6a09..622bef537488f9da204e13f008eadf0ff1796fe5 100644 (file)
@@ -118,11 +118,11 @@ see the following:
 
    at the Altera Standard 32 to SRAM:
 
-       ==> cp.b 800000 40000 $(filesize)
+       ==> cp.b 800000 40000 ${filesize}
 
    at the Microtronix LDK 2.0 to SDRAM:
 
-       ==> cp.b 1010000 8000000 $(filesize)
+       ==> cp.b 1010000 8000000 ${filesize}
 
 U-Boot will now automatically start when the board is powered on or
 reset using the Standard-32 configuration. To start U-Boot with the
index c23fcc7a006520abdba46683a6b4587a9a87686b..14d56bfd97d1c8b4ca7eb4a9c93a84fec478e08e 100644 (file)
@@ -55,8 +55,8 @@
 
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"                         /* autoboot command */
 
 #undef CONFIG_BOOTARGS
index 3ac567b4d93e110446f8e3eae7d02efac1a5a00b..3df99a008b9787e693ac3a02000a6ba55c63cae8 100644 (file)
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_RAMBOOTCOMMAND                                                  \
-       "setenv bootargs root=/dev/ram rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/ram rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm ffc00000 ffca0000"
 #define CONFIG_NFSBOOTCOMMAND                                                  \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm ffc00000"
 #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND
 
index 81c8d59e813cd47b11c65b9ca1acfc79349addcd..46bdfa2ee62c880c53558440dbb299a36343e1f9 100644 (file)
@@ -59,8 +59,8 @@
 #define CONFIG_BOOTCOMMAND                                  \
     "bootp 1000000; "                                       \
     "setenv bootargs root=ramfs console=ttyS00,9600 "       \
-    "ip=$(ipaddr):$(serverip):$(rootpath):$(gatewayip):"    \
-    "$(netmask):$(hostname):eth0:none; "                    \
+    "ip=${ipaddr}:${serverip}:${rootpath}:${gatewayip}:"    \
+    "${netmask}:${hostname}:eth0:none; "                    \
     "bootm"
 
 #define CONFIG_LOADS_ECHO       0       /* echo off for serial download */
index 9401db17df8596288c03ea1583d0554b53acf0a4..e8994ffef79439017caab3f14f36d923dfdb2efd 100644 (file)
@@ -59,8 +59,8 @@
 #undef CONFIG_BOOTARGS
 
 #define CONFIG_BOOTCOMMAND      "setenv bootargs " \
-                               "mem=$(mem) " \
-                               "root=/dev/ram rw ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off " \
+                               "mem=${mem} " \
+                               "root=/dev/ram rw ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off " \
                                "wt_8xx=timeout:3600; " \
                                "bootm"
 
index 09185b1dbbc7388e7b0a35b8ef997dfee576d8e2..16a9ea5dd710db9aae16ea1bf2ceeff1d0f26866 100644 (file)
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 /*-----------------------------------------------------------------------
index c50870fedca06cf3cfbce78e51a60fa8b09fbaa4..a23d7e50b7bda3f2b64523ac223a08ec8a522291 100644 (file)
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 /*-----------------------------------------------------------------------
index e2b4b1da62974123ff453b09126c024579cbddef..bd7aff12cc189aff61116c3d2c6523397a61355f 100644 (file)
@@ -174,8 +174,8 @@ if we use PCI it has its own MAC addr */
 /* ronen - autoboot using tftp */
 #if (CONFIG_BOOTDELAY >= 0)
 #define CONFIG_BOOTCOMMAND     "tftpboot 0x400000 uImage;\
- setenv bootargs $(bootargs) $(bootargs_root) nfsroot=$(serverip):$(rootpath) \
- ip=$(ipaddr):$(serverip)$(bootargs_end);  bootm 0x400000; "
+ setenv bootargs ${bootargs} ${bootargs_root} nfsroot=${serverip}:${rootpath} \
+ ip=${ipaddr}:${serverip}${bootargs_end};  bootm 0x400000; "
 
 #define CONFIG_BOOTARGS "console=ttyS0,115200"
 
@@ -190,8 +190,8 @@ cp.b 100000 FFF00000 0x40000;protect on 1:0-7;\0" \
       "bootargs_root=root=/dev/nfs rw\0" \
       "bootargs_end=:::DB64360:eth0:none \0"\
       "ethprime=mv_enet0\0"\
-      "standalone=fsload 0x400000 uImage;setenv bootargs $(bootargs) root=/dev/mtdblock/0 rw \
-ip=$(ipaddr):$(serverip)$(bootargs_end); bootm 0x400000;\0"
+      "standalone=fsload 0x400000 uImage;setenv bootargs ${bootargs} root=/dev/mtdblock/0 rw \
+ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 
 /* --------------------------------------------------------------------------------------------------------------- */
 /* New bootcommands for Marvell DB64360 c 2002 Ingo Assmus */
index 5f541bb9a97e63090332c6c33f3c201cd544f80f..4b72e9b9e4022961ecb80466393e506225f37f05 100644 (file)
 /* ronen - autoboot using tftp */
 #if (CONFIG_BOOTDELAY >= 0)
 #define CONFIG_BOOTCOMMAND     "tftpboot 0x400000 uImage;\
- setenv bootargs $(bootargs) $(bootargs_root) nfsroot=$(serverip):$(rootpath) \
- ip=$(ipaddr):$(serverip)$(bootargs_end);  bootm 0x400000; "
+ setenv bootargs ${bootargs} ${bootargs_root} nfsroot=${serverip}:${rootpath} \
+ ip=${ipaddr}:${serverip}${bootargs_end};  bootm 0x400000; "
 
 #define CONFIG_BOOTARGS "console=ttyS0,115200"
 
@@ -128,8 +128,8 @@ cp.b 100000 FFF00000 0x40000;protect on 1:0-7;\0" \
       "bootargs_root=root=/dev/nfs rw\0" \
       "bootargs_end=:::DB64460:eth0:none \0"\
       "ethprime=mv_enet0\0"\
-      "standalone=fsload 0x400000 uImage;setenv bootargs $(bootargs) root=/dev/mtdblock/0 rw \
-ip=$(ipaddr):$(serverip)$(bootargs_end); bootm 0x400000;\0"
+      "standalone=fsload 0x400000 uImage;setenv bootargs ${bootargs} root=/dev/mtdblock/0 rw \
+ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
 
 /* --------------------------------------------------------------------------------------------------------------- */
 /* New bootcommands for Marvell DB64460 c 2002 Ingo Assmus */
index e51d058047756eecb572ba1e6a4c5ed716ac5b97..2c99b4b16283818dbdbebe72803eb65c2ff8b3cc 100644 (file)
@@ -59,8 +59,8 @@
 #define CONFIG_BOOTCOMMAND                                  \
     "bootp 1000000; "                                       \
     "setenv bootargs root=ramfs console=ttyS00,9600 "       \
-    "ip=$(ipaddr):$(serverip):$(rootpath):$(gatewayip):"    \
-    "$(netmask):$(hostname):eth0:none; "                    \
+    "ip=${ipaddr}:${serverip}:${rootpath}:${gatewayip}:"    \
+    "${netmask}:${hostname}:eth0:none; "                    \
     "bootm"
 
 #define CONFIG_LOADS_ECHO       0       /* echo off for serial download */
index 5bfdc9be1211d7780f8e744aaaac4e26836fe8ea..e73bcec4485fa81a5dcfab40b5c52d17747bc641 100644 (file)
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
     "ramargs=setenv bootargs root=/dev/ram rw\0"                       \
-    "rootargs=setenv rootpath /tftp/$(ipaddr)\0"                       \
+    "rootargs=setenv rootpath /tftp/${ipaddr}\0"                       \
     "nfsargs=setenv bootargs root=/dev/nfs rw "                                \
-       "nfsroot=$(serverip):$(rootpath)\0"                             \
-    "addip=setenv bootargs $(bootargs) "                               \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"              \
-       ":$(hostname):eth0:off panic=1\0"                               \
+       "nfsroot=${serverip}:${rootpath}\0"                             \
+    "addip=setenv bootargs ${bootargs} "                               \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"              \
+       ":${hostname}:eth0:off panic=1\0"                               \
     "ramboot=tftp 400000 /home/paugaml/pMulti;"                                \
        "run ramargs;bootm\0"                                           \
     "nfsboot=tftp 400000 /home/paugaml/uImage;"                                \
index 137b1a71b3006dfe1ef703193d06687a4d88ed75..d55eb7d192ec644aad06c9cbd809ecdfba226c45 100644 (file)
        "setenv bootargs root=/dev/ram rw ramdisk_size=4690 "                   \
        "U-Boot_version=U-Boot-1.0.x-Date "                                     \
        "panic=1 "                                                              \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 #define CONFIG_NFSBOOTCOMMAND                                                  \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(nfsip):$(rootpath) "        \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${nfsip}:${rootpath} "        \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 #define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND
 
index 726ab371e4d174b1a454028456c8819342a59a08..1b562d606354388f87ef9ff841d815f1252c40da 100644 (file)
@@ -96,8 +96,8 @@
 #define CONFIG_BOOTCOMMAND                                                     \
 "bootp ;"                                                                      \
 "setenv bootargs console=tty0 console=ttyS0 "                                  \
-"root=/dev/nfs nfsroot=$(serverip):$(rootpath) "                               \
-"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname):eth0:off ;"      \
+"root=/dev/nfs nfsroot=${serverip}:${rootpath} "                               \
+"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off ;"      \
 "bootm"
 #else
 #define CONFIG_BOOTDELAY       0       /* autoboot disabled            */
index d9a7fb0fb8cb987b66ed27f576e69d2da56835af..db42fd06fe50cb060378500918f301867abe359d 100644 (file)
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off\0"                          \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off\0"                          \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
                "panic=1\0"                                             \
        "flash_nfs=run nfsargs addip addmisc;"                          \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addmisc;"                         \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);"                              \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};"                              \
                "run nfsargs addip addmisc;bootm\0"                     \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/g2000/pImage\0"                             \
index 0702c2cf6392be00ecd0863ca298939b46ad023d..de8f7ae7112d6f02c19b202fcf83990324ce408d 100644 (file)
@@ -92,8 +92,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND     \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 
 /*
index ef2cb3a85423da5f7768525a725fe4378ab1b5f8..8c01d97fa33fecdde140ba85fbb104bcf03ed385 100644 (file)
@@ -96,8 +96,8 @@
 #define CONFIG_BOOTCOMMAND                                                     \
 "bootp; tftp; "                                                                        \
 "setenv bootargs console=tty0 console=ttyS0 "                                  \
-"root=/dev/nfs nfsroot=$(serverip):$(rootpath) "                               \
-"ip=$(ipaddr):$(serverip):$(gatewayip):$(subnetmask):$(hostname):eth0:off ;"   \
+"root=/dev/nfs nfsroot=${serverip}:${rootpath} "                               \
+"ip=${ipaddr}:${serverip}:${gatewayip}:${subnetmask}:${hostname}:eth0:off ;"   \
 "bootm "
 #else
 #define CONFIG_BOOTDELAY       0       /* autoboot disabled            */
index 6645b8bab08ab18e25f8305a27f7d6d4fd20b4cd..7cce876924e4f2c66246c34396e7458a4e850504 100644 (file)
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/HMI10/uImage\0"                             \
        "kernel_addr=40040000\0"                                        \
index 32d59a4d77a6feef56daaf9e87e900beb37db21a..35d84aedf8ad35eea743c4ad4d46d0b9beeca14a 100644 (file)
@@ -71,8 +71,8 @@
 #undef CONFIG_BOOTARGS
 /* #define CONFIG_BOOTCOMMAND                                                  \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 */
 
index 73ff0a35606f151b080e5d537335b839e9628a54..cd17935893f5e25002f266d3dc491605cbd50f2e 100644 (file)
@@ -73,8 +73,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
index 729b0486917517ef4650985010fa7c9cf92af24d..aaa44c539893aee2463cb9e98ac33c9e46d81413 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw "                     \
        "console=ttyS0,115200\0"                                        \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\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"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/IDS8247/uImage\0"                           \
        "kernel_addr=ff800000\0"                                        \
index aa2243f3a249b1c17118b55720314a509a5e98a5..0e20e5676349be1b2a42c41ad59150c5390d5a53 100644 (file)
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
 #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" \
-"\0load=tftp \"/tftpboot/u-boot.bin\"\0update=protect off 1:0;era 1:0;cp.b 100000 10000000 $(filesize)\0"
+"\0load=tftp \"/tftpboot/u-boot.bin\"\0update=protect off 1:0;era 1:0;cp.b 100000 10000000 ${filesize}\0"
 
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 9d4e7b230912e042a6863f5dd3333024ee371b05..afba5c625e8b362dec68eda378006c62fec0a2d2 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
        ""
index 4d39b352a299540199f96f787e8a0e8af55522bd..9b950fc5d169ca3083636ac7c8c83e42a9785a99 100644 (file)
  "run addhw; diskboot 200000 2:1; bootm 200000\0"                              \
 "nfs_boot=dhcp; run nfsargs addip addhw; bootm 200000\0"                       \
 "panic_boot=echo No Bootdevice !!! reset\0"                                    \
-"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\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\0"                                     \
-"addhw=setenv bootargs $(bootargs) hw=$(hw) key1=$(key1) panic=1\0"            \
+"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}"      \
+ ":${netmask}:${hostname}:${netdev}:off\0"                                     \
+"addhw=setenv bootargs ${bootargs} hw=${hw} key1=${key1} panic=1\0"            \
 "netdev=eth0\0"                                                                        \
 "contrast=55\0"                                                                        \
 "silent=1\0"                                                                   \
 "load=tftp 200000 bootloader-4k.bitmap;tftp 100000 bootloader-4k.bin\0"                \
-"update=protect off 1:0-7;era 1:0-7;cp.b 100000 40000000 $(filesize);"         \
+"update=protect off 1:0-7;era 1:0-7;cp.b 100000 40000000 ${filesize};"         \
  "cp.b 200000 40050000 14000\0"
 
 #define CONFIG_BOOTCOMMAND  \
index 9a42cb17d1ae4bce3c96fc7fe2bd449cbed4df7c..cd38b0f2c2f4b790d649f53337d8e1fab9bd5a7d 100644 (file)
  usb stop; bootm 200000\0"      \
 "nfs_boot=dhcp;run nfsargs addip addhw;bootm 200000\0"                         \
 "panic_boot=echo No Bootdevice !!! reset\0"                                    \
-"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\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\0"                                     \
-"addhw=setenv bootargs $(bootargs) hw=$(hw) key1=$(key1) panic=1\0"            \
+"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}"      \
+ ":${netmask}:${hostname}:${netdev}:off\0"                                     \
+"addhw=setenv bootargs ${bootargs} hw=${hw} key1=${key1} panic=1\0"            \
 "netdev=eth0\0"                                                                        \
 "silent=1\0"                                                                   \
 "load=tftp 200000 bootloader-4x.bitmap;tftp 100000 bootloader-4x.bin\0"                \
-"update=protect off 1:0-5;era 1:0-5;cp.b 100000 40000000 $(filesize);"         \
+"update=protect off 1:0-5;era 1:0-5;cp.b 100000 40000000 ${filesize};"         \
  "cp.b 200000 40040000 14000\0"
 
 #define CONFIG_BOOTCOMMAND  \
index cd21c2dbbef7c5c4b5038d862cca00e88c784dcf..53684ca6b57f2ef32f0ea150a64bde54f628f139 100644 (file)
@@ -58,8 +58,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND     \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 4ebbf35c9345247a61d4973eee713b27f8679c4a..4953b7053be1fff3e126cf6736a6db6f554de6ea 100644 (file)
        "echo;" \
        "bootp;" \
        "setenv bootargs root=/dev/ram0 rw " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_INITRD */
 
        "version;" \
        "echo;" \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_NFS */
 
index 32f9e91c3beec7c1e383da158dd65570faf6eed7..88eefa190749693ba2be2bd922bf8168f185c61c 100644 (file)
     "flashboot=setenv bootargs root=/dev/mtdblock5 ro rootfstype=jffs2;run addcons;bootm ffc00000\0"   \
     "safeboot=setenv bootargs root=/dev/mtdblock2 rw rootfstype=cramfs;run addcons;bootm ffc00000\0"   \
     "hdboot=setenv bootargs root=/dev/hda1;run addcons;bootm ffc00000\0"       \
-       "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-                       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off\0"   \
-       "addcons=setenv bootargs $(bootargs) console=ttyS$(console_nr),$(baudrate)N8\0" \
+       "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+                       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0"   \
+       "addcons=setenv bootargs ${bootargs} console=ttyS${console_nr},${baudrate}N8\0" \
     "mv_version=" MV_VERSION "\0"      \
        "bootretry=30\0"
 
index 49bdc45a4a226195c901fa6bd105144c1bc9f9a8..5995918266d0d7fee30a42e3e32c234e89c4b3ec 100644 (file)
@@ -50,8 +50,8 @@
 #define        CONFIG_BOOTARGS         "root=/dev/mtdblock2 rw"
 #define CONFIG_BOOTCOMMAND                                             \
     "bootp; "                                                          \
-    "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-    "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+    "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+    "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
     "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index cd04c1ad5a373951581abcb2453d772589940b7c..371ea17edd231530ec1483a8fb8eda8de11c2edf 100644 (file)
@@ -71,8 +71,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
index db86cf382f258f1a070046669459cb5c9e043f94..d994420096b1f8d4573b8da099d0b4ed5736c094 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/NSCU/uImage\0"                              \
        "kernel_addr=40080000\0"                                        \
index 7d6bbf51d26c7e059396fcc75601aa6b6dcef77c..a933e1b180cf5c8decef3a1a2fe74e3da18c7ff3 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=p3g4\0"                                               \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_74xx\0"                                 \
        "bootfile=/tftpboot/p3g4/uImage\0"                              \
        "ramdisk_addr=ff010000\0"                                       \
        "load=tftp 100000 /tftpboot/p3g4/u-boot.bin\0"                  \
        "update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;"   \
-               "cp.b 100000 fff00000 $(filesize);"                     \
+               "cp.b 100000 fff00000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
        "upd=run load;run update\0"                                     \
        ""
index 1189989342c069932f4d7a100bf3da4883dc999a..9f1dec82b876895635df68c4d5f7f2e6b39b93af 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=pm520\0"                                                      \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk30/ppc_82xx\0"                                       \
        "bootfile=/tftpboot/PM520/uImage\0"                             \
        ""
index 9ca1e52299d74cc17df05bac05740487b48818cc..6e5e3bbe18cf29334fced893fe9c6db6e10b5ae0 100644 (file)
@@ -48,8 +48,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 /* enable I2C and select the hardware/software driver */
index 7d98df5cac4435b884b710fdcc700399118e5935..982a1f814301a57cbbb27b2937137cb390758e81 100644 (file)
@@ -48,8 +48,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 
 /* enable I2C and select the hardware/software driver */
index 5f748a0366e0357e07d173b21afd18eaf4c146d9..a717659bb695682418b75f2d030455ce23c9664a 100644 (file)
@@ -68,8 +68,8 @@
 #define CONFIG_BOOTCOMMAND \
                        "setenv verify y;" \
                                "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
-                       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-                       "ip=$(ipaddr):$(serverip)::$(netmask):pn62:eth0:off;" \
+                       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 100000; bootm"
                        /* "tftpboot 100000 uImage; bootm" */
 #else
@@ -78,7 +78,7 @@
                        "setenv verify n;" \
                                "setenv bootargs console=ttyS0,19200 mem=31M quiet " \
                        "root=/dev/ram rw " \
-                       "ip=$(ipaddr):$(serverip)::$(netmask):pn62:eth0:off;" \
+                       "ip=${ipaddr}:${serverip}::${netmask}:pn62:eth0:off;" \
                        "loadp 200000; bootm"
 #endif
 
index 37c5cf430bc79a4fa3b4cbf4feaa05840675e717..32faa61607bca133eab2461ec01e52961414c461 100644 (file)
@@ -79,8 +79,8 @@
 #undef CONFIG_BOOTARGS
 /* TODO compare against CADM860 */
 #define CONFIG_BOOTCOMMAND     "bootp; " \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
index d7b093b3cff89da301b659842b921f1fc54814e1..82228c0126b5027a8b6ae7b3249b50827225f274 100644 (file)
@@ -63,8 +63,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #undef CONFIG_SCC1_ENET
index dbc3c8633d9b0d693c2befc00d93454ff9e4d107..242c837a3b86ab5be554761fa7cd130a18c9be8c 100644 (file)
@@ -66,8 +66,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 7294561b0b74d3339b15a349f5d103e3aa9a88a6..591382cd24d8d3ba1597824156306bba885cf7b8 100644 (file)
@@ -79,8 +79,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "tftpboot; "                                                            \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 04293f3e964697ba1b3a6fbe68fa588019ceecc8..6b65031099444a9d92ae06aa2510328ff38cfc19 100644 (file)
@@ -58,8 +58,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index ea01bc47506953812ceec90bf0308cd4cded2926..8cd7df1ecff4c86a2d6dfcaf8b5d12466a9c5d88 100644 (file)
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs console=tty0 console=ttyS0,9600 "      \
-               "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\0"    \
+               "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
        "ramargs=setenv bootargs console=tty0 root=/dev/ram rw\0"       \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\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"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "gatewayip=172.16.115.254\0"                                    \
        "netmask=255.255.255.0\0"                                       \
        "kernel_addr=ff040000\0"                                        \
        "ramdisk_addr=ff200000\0"                                       \
-       "ku=era $(kernel_addr) ff1fffff;cp.b 100000 $(kernel_addr) "    \
-               "$(filesize);md $(kernel_addr);"                        \
+       "ku=era ${kernel_addr} ff1fffff;cp.b 100000 ${kernel_addr} "    \
+               "${filesize};md ${kernel_addr};"                        \
                "echo kernel updating finished\0"                       \
        "uu=protect off 1:0-4;era 1:0-4;cp.b 100000 ff000000 "          \
-               "$(filesize);md ff000000;"                              \
+               "${filesize};md ff000000;"                              \
                "echo u-boot updating finished\0"                       \
        "eu=protect off 1:6;era 1:6;reset\0"                            \
        "lcd=setenv stdout lcd;setenv stdin lcd\0"                      \
index 7f2c8a474648d572151f7bdfbfc885d3c13f948b..3885bcdb1ef56c3313ea6e316622bb1fed2660a1 100644 (file)
        "netdev=eth0\0"                                                 \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
-       "addip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip)"    \
-               ":$(gatewayip):$(netmask):$(hostname):$(netdev):off\0"  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+               "nfsroot=${serverip}:${rootpath}\0"                     \
+       "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}"    \
+               ":${gatewayip}:${netmask}:${hostname}:${netdev}:off\0"  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "load=tftp 100000 /tftpboot/u-boot.bin\0"                       \
        "update=protect off 1:0-8;era 1:0-8;"                           \
-               "cp.b 100000 40000000 $(filesize);"                     \
+               "cp.b 100000 40000000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
        "kernel_addr=40040000\0"                                        \
        "ramdisk_addr=40100000\0"                                       \
        "kernel_img=/tftpboot/uImage\0"                                 \
-       "kernel_load=tftp 200000 $(kernel_img)\0"                       \
+       "kernel_load=tftp 200000 ${kernel_img}\0"                       \
        "net_nfs=run kernel_load nfsargs addip addtty;bootm\0"          \
-       "flash_nfs=run nfsargs addip addtty;bootm $(kernel_addr)\0"     \
+       "flash_nfs=run nfsargs addip addtty;bootm ${kernel_addr}\0"     \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"
 
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 91914e80defba9f9b227be1bacadc25cad6f43f9..e263db65a2f7b84b1faccc7a8d402182c5c8962d 100644 (file)
@@ -68,8 +68,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 /* enable I2C and select the hardware/software driver */
index c23b3860a8456a275289416109ea3990ee556f5f..49776291211d899995c832b8ad057fe52faeb484 100644 (file)
@@ -55,8 +55,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 7c4feee3f51fe6b7dee47fe8fcddde09b273e99b..f4339ecd9c8209fb0ce3a4299bc8eedf15f6d94e 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "net_self=tftp $(kernel_addr) $(bootfile);"                     \
-               "tftp $(ramdisk_addr) $(ramdisk);"                      \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "net_self=tftp ${kernel_addr} ${bootfile};"                     \
+               "tftp ${ramdisk_addr} ${ramdisk};"                      \
                "run ramargs addip;"                                    \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp $(kernel_addr) $(bootfile);"                      \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp ${kernel_addr} ${bootfile};"                      \
                "run nfsargs addip;bootm\0"                             \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/SP8240/uImage\0"                            \
index e46f5e407d1a176648e1d0ccada63edef3f007e6..f41dbd0ccb18f3f8a0f292fc30c8dc60e3cd2c8e 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
        ""
index 99a7b08e4d60c2d052ecf342a27d0743caa2bd3a..2344b96811b9eaf1f2c4f744e0ab817e3b4623d5 100644 (file)
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND     \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 
 /*
index 1236ce35a8d64b0e04d98df2619f19d80d32df88..e23fd7786107d51a3cb03490208f44b199a2af9d 100644 (file)
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\0"                  \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr}\0"                                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "bootfile=/tftpboot/tqm5200/uImage\0"                           \
-       "load=tftp 200000 $(u-boot)\0"                                  \
+       "load=tftp 200000 ${u-boot}\0"                                  \
        "u-boot=/tftpboot/tqm5200/u-boot.bin"   CONFIG_U_BOOT_SUFFIX    \
        "update=protect off FC000000 FC05FFFF;"                         \
                "erase FC000000 FC05FFFF;"                              \
-               "cp.b 200000 FC000000 $(filesize);"                     \
+               "cp.b 200000 FC000000 ${filesize};"                     \
                "protect on FC000000 FC05FFFF\0"                        \
        ""
 
index d12aabecf9390454411b69f7cb8e2f85ddee01a4..b1c70f88c26db74c262bd2f5d988b92cf5fda509 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM823L/uImage\0"                           \
        "kernel_addr=40040000\0"                                        \
index a838a95b5ff81fcb01d9e3b13e77f7d37e05f2c3..9f958f547742d2817a5c2bf11e116a310c63ffb2 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM823M/uImage\0"                           \
        "kernel_addr=40080000\0"                                        \
index e6266b58d15314f77512007f1b0975144513733e..49c3872630c9609a12ef3ea573fdb8237d614eaf 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/TQM8260/uImage\0"                           \
        "kernel_addr=40040000\0"                                        \
index d434eb75999a8bbf2961281b1f478888e9de2a8f..c25a7775b8772dfe61f1c63ed05396d353ac3fc5 100644 (file)
@@ -472,17 +472,17 @@ extern int tqm834x_num_flash_banks;
        "netdev=eth0\0"                                                 \
        "hostname=tqm83xx\0"                                            \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=/tftpboot/tqm83xx/uImage\0"                           \
index 83eb40f7483b8c83d28e5c8490d363b761022d3d..16b2ce3f05895c1115a127e2d962f5fa20a0bd40 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM850L/uImage\0"                           \
        "kernel_addr=40040000\0"                                        \
index f20d246d37e530d5fba0ec249b8bfe6937bf787d..bbc69608b26156db010d256fd09e7f053ee5cb6a 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM850M/uImage\0"                           \
        "kernel_addr=40080000\0"                                        \
index 24071ff1dc30dfc60d7435f807edeb1eab0be93e..198db1954d8cde928d4fa92f53e8b664d90bdd4f 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM855L/uImage\0"                           \
        "kernel_addr=40040000\0"                                        \
index 95a41e8afdf1ddfe937d3c5996b8cfaecca4be24..e25a7a204ff793bf8e2d333179dfa36d3b50e914 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM855M/uImage\0"                           \
        "kernel_addr=40080000\0"                                        \
index 655427ec77d0c8ff668a0539a1e0697d388712c1..4a1a4325dc0160041ececfb914f16ff2f0ebd509 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM860L/uImage\0"                           \
        "kernel_addr=40040000\0"                                        \
index f67cbd2de344a1d697dd78136db2078bf7b6e167..4b754ba9cb9f94fb2b7890e8d72a88bf74a48511 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM860M/uImage\0"                           \
        "kernel_addr=40080000\0"                                        \
index 2586518bb9e64e06b4d634fcfae9d082ecb88236..1dc9f74d5e113a6a0e2dbd3bda111c2b5c060493 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM862L/uImage\0"                           \
        "kernel_addr=40040000\0"                                        \
index 8c154995f4961c10ced742cbb1febe8f922bbb5d..3df060c619af9fed22d9ab74972e99ba9ac73c29 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM862M/uImage\0"                           \
        "kernel_addr=40080000\0"                                        \
index ea51e89e3433b38d58b9f4fc8d128bdcf4a27275..8f9c2c9cbb59816a65d398498ee2d21470ccb0fc 100644 (file)
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/TQM866M/uImage\0"                           \
        "kernel_addr=40080000\0"                                        \
index ab02dd1285ed909697c653dc1ba2148d6539450d..817570323621a8df5930f86d0b5d805ae4fc7b3d 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
        ""
index d7f874974bc1dacc7371691a80a1e108639c61c4..92bade5187e13911bf15b1a190aac59053769187 100644 (file)
 #undef  CONFIG_BOOTARGS
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
 "clean_nv=erase fff20000 ffffffff\0" \
-"update_boss=tftp 100000 PPC/logic157.bin; protect off fff00000 ffffffff; erase fff00000 ffffffff; cp.b 100000 fff00000 $(filesize); tftp 100000 PPC/bootmon157.bin; cp.b 100000 fff20000 $(filesize)\0" \
-"update_lx=tftp 100000 $(kernel); erase $(kernel_addr) ffefffff; cp.b 100000 $(kernel_addr) $(filesize)\0" \
-"update_fs=tftp 100000 $(fs).$(fstype); erase ff840000 ffdfffff; cp.b 100000 ff840000 $(filesize)\0" \
-"update_ub=tftp 100000 $(uboot); protect off fff00000 fff1ffff; erase fff00000 fff1ffff; cp.b 100000 fff00000 $(filesize); protect off ff820000 ff83ffff; erase ff820000 ff83ffff\0" \
-"flashargs=setenv bootargs root=$(rootdev) rw rootfstype=$(fstype)\0" \
-"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\0" \
-"addip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname):$(netdev):off\0" \
-"addmisc=setenv bootargs $(bootargs) console=$(console),$(baudrate) ethaddr=$(ethaddr) panic=1\0" \
-"net_nfs=tftpboot 400000 $(kernel); run nfsargs addip addmisc; bootm\0" \
-"net_self=tftpboot 400000 $(kernel); run flashargs addmisc; bootm\0" \
-"flash_self=run flashargs addmisc; bootm $(kernel_addr)\0" \
-"flash_nfs=run nfsargs addip addmisc; bootm $(kernel_addr)\0" \
+"update_boss=tftp 100000 PPC/logic157.bin; protect off fff00000 ffffffff; erase fff00000 ffffffff; cp.b 100000 fff00000 ${filesize}; tftp 100000 PPC/bootmon157.bin; cp.b 100000 fff20000 ${filesize}\0" \
+"update_lx=tftp 100000 ${kernel}; erase ${kernel_addr} ffefffff; cp.b 100000 ${kernel_addr} ${filesize}\0" \
+"update_fs=tftp 100000 ${fs}.${fstype}; erase ff840000 ffdfffff; cp.b 100000 ff840000 ${filesize}\0" \
+"update_ub=tftp 100000 ${uboot}; protect off fff00000 fff1ffff; erase fff00000 fff1ffff; cp.b 100000 fff00000 ${filesize}; protect off ff820000 ff83ffff; erase ff820000 ff83ffff\0" \
+"flashargs=setenv bootargs root=${rootdev} rw rootfstype=${fstype}\0" \
+"nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
+"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off\0" \
+"addmisc=setenv bootargs ${bootargs} console=${console},${baudrate} ethaddr=${ethaddr} panic=1\0" \
+"net_nfs=tftpboot 400000 ${kernel}; run nfsargs addip addmisc; bootm\0" \
+"net_self=tftpboot 400000 ${kernel}; run flashargs addmisc; bootm\0" \
+"flash_self=run flashargs addmisc; bootm ${kernel_addr}\0" \
+"flash_nfs=run nfsargs addip addmisc; bootm ${kernel_addr}\0" \
 "fstype=cramfs\0" \
 "rootpath=/root_fs\0" \
 "uboot=PPC/u-boot.bin\0" \
index ca6e52b2829bbf2718f59c4810f538d97d491545..aa6bc91b20fda543c5291f0bdfa8957cc4e8df1f 100644 (file)
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath) "                      \
-               "console=ttyS0,$(baudrate)\0"                           \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\0"                  \
+               "nfsroot=${serverip}:${rootpath} "                      \
+               "console=ttyS0,${baudrate}\0"                           \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr}\0"                                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "bootfile=/tftpboot/tqm5200/uImage\0"                           \
-       "load=tftp 200000 $(u-boot)\0"                                  \
+       "load=tftp 200000 ${u-boot}\0"                                  \
        "u-boot=/tftpboot/tqm5200/u-boot.bin\0"                         \
        "update=protect off FC000000 FC05FFFF;"                         \
                "erase FC000000 FC05FFFF;"                              \
-               "cp.b 200000 FC000000 $(filesize);"                     \
+               "cp.b 200000 FC000000 ${filesize};"                     \
                "protect on FC000000 FC05FFFF\0"                        \
        ""
 
index 881a4caee6e4c6636f80ff1c277a544db6c2391f..bf6c1709d909f1cc6b20d2c27ce56b4a12331742 100644 (file)
 #define CONFIG_BOOTCOMMAND                                             \
        "bootp;"                                                        \
        "setenv bootargs root=/dev/nfs rw "                             \
-       "nfsroot=$(serverip):$(rootpath) "                              \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"\
+       "nfsroot=${serverip}:${rootpath} "                              \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"\
        "bootm"
 
 /*-----------------------------------------------------------------------
index e681f6c9339a71a7e9c052fbc81d7e4193f40c0e..ab8a1e78f10a6bd74747334ab0dc6430279be28a 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=bamboo\0"                                             \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/bamboo/uImage\0"                            \
index 2f99ef044e12ef2eed26ef7c9e002559dd456996..4a79835d6ac3c30e938f4a654daaabe441e02c67 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=bubinga\0"                                            \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/bubinga/uImage\0"                           \
index c1499f425eebefa14ea864d21cfc0f821ff257d9..ae75539c37aabee0b57af3a4a83efdf90cffcdf9 100644 (file)
@@ -55,8 +55,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 9b91d5881c2b433edd356497ea32516fd4345f82..2c160a44891a63fd37d46373b3d4fa76c748a703 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "bootfile=/tftpboot/canmb/uImage\0"                             \
        ""
index 9ed538b110284310527597c98b2b0158f80b2854..46280f7e325381863b02088ea26a65406be5127e 100644 (file)
@@ -216,30 +216,30 @@ struct bd_info_ext {
 #define CONFIG_VERSION_VARIABLE        1       /* include version env variable */
 
 #define        CONFIG_EXTRA_ENV_SETTINGS       \
-       "net_nfs=tftp $(loadaddr) $(bootfile);run nfsargs addip addcons " \
+       "net_nfs=tftp ${loadaddr} ${bootfile};run nfsargs addip addcons " \
                "addmtd;bootm\0" \
        "nfsargs=setenv bootargs root=/dev/nfs rw " \
-               "nfsroot=$(serverip):$(rootpath)\0" \
-       "net_cramfs=tftp $(loadaddr) $(bootfile); run flashargs addip " \
+               "nfsroot=${serverip}:${rootpath}\0" \
+       "net_cramfs=tftp ${loadaddr} ${bootfile}; run flashargs addip " \
                "addcons addmtd; bootm\0" \
        "flash_cramfs=run flashargs addip addcons addmtd; bootm 10030000\0" \
        "flashargs=setenv bootargs root=/dev/mtdblock3 ro\0" \
-       "addip=setenv bootargs $(bootargs) ethaddr=$(ethaddr) " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):" \
-               "$(hostname)::off\0" \
-       "addcons=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0" \
-       "addmtd=setenv bootargs $(bootargs) mtdparts=cmc_pu2:128k(uboot)ro," \
+       "addip=setenv bootargs ${bootargs} ethaddr=${ethaddr} " \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
+               "${hostname}::off\0" \
+       "addcons=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \
+       "addmtd=setenv bootargs ${bootargs} mtdparts=cmc_pu2:128k(uboot)ro," \
                "64k(environment),768k(linux),4096k(root),-\0" \
-       "load=tftp $(loadaddr) $(loadfile)\0" \
+       "load=tftp ${loadaddr} ${loadfile}\0" \
        "update=protect off 10000000 1001ffff;erase 10000000 1001ffff; " \
-               "cp.b $(loadaddr) 10000000 $(filesize);" \
+               "cp.b ${loadaddr} 10000000 ${filesize};" \
                "protect on 10000000 1001ffff\0" \
-       "updatel=era 10030000 100effff;tftp $(loadaddr) $(bootfile); " \
-               "cp.b $(loadaddr) 10030000 $(filesize)\0" \
-       "updatec=era 100f0000 104effff;tftp $(loadaddr) $(cramfsimage); " \
-               "cp.b $(loadaddr) 100f0000 $(filesize)\0" \
-       "updatej=era 104f0000 107fffff;tftp $(loadaddr) $(jffsimage); " \
-               "cp.b $(loadaddr) 104f0000 $(filesize)\0" \
+       "updatel=era 10030000 100effff;tftp ${loadaddr} ${bootfile}; " \
+               "cp.b ${loadaddr} 10030000 ${filesize}\0" \
+       "updatec=era 100f0000 104effff;tftp ${loadaddr} ${cramfsimage}; " \
+               "cp.b ${loadaddr} 100f0000 ${filesize}\0" \
+       "updatej=era 104f0000 107fffff;tftp ${loadaddr} ${jffsimage}; " \
+               "cp.b ${loadaddr} 104f0000 ${filesize}\0" \
        "cramfsimage=cramfs_cmc-pu2.img\0" \
        "jffsimage=jffs2_cmc-pu2.img\0" \
        "loadfile=u-boot_cmc-pu2.bin\0" \
index 711e348139836f9d2b3a2e6f4c44557fae034776..f9586fbcb94cea97293f22cba3d1c62329b8fd72 100644 (file)
        "netdev=eth0\0" \
        "flash_vxworks0=run ata_vxworks_args;setenv loadaddr ff000000;bootvx\0" \
        "flash_vxworks1=run ata_vxworks_args;setenv loadaddr ff200000:bootvx\0" \
-       "net_vxworks=phypower 1;sleep 2;tftp $(loadaddr) $(image);run vxworks_args;bootvx\0" \
-       "vxworks_args=setenv bootargs fec(0,0)$(host):$(image) h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script)\0" \
-       "ata_vxworks_args=setenv bootargs /ata0/vxWorks h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script) o=fec0 \0" \
+       "net_vxworks=phypower 1;sleep 2;tftp ${loadaddr} ${image};run vxworks_args;bootvx\0" \
+       "vxworks_args=setenv bootargs fec(0,0)${host}:${image} h=${serverip} e=${ipaddr} g=${gatewayip} u=${user} ${pass} tn=${target} s=${script}\0" \
+       "ata_vxworks_args=setenv bootargs /ata0/vxWorks h=${serverip} e=${ipaddr} g=${gatewayip} u=${user} ${pass} tn=${target} s=${script} o=fec0 \0" \
        "loadaddr=01000000\0" \
        "serverip=192.168.2.99\0" \
        "gatewayip=10.0.0.79\0" \
index b4453b10ff530c0a6ccd11f9d6b0c15e96c5bc37..27d64c1e434a91eb30619f620cf54dec38ca89df 100644 (file)
@@ -58,7 +58,7 @@
 #define CONFIG_BOOTCOMMAND \
        "setenv bootargs console=ttyS0,38400 debug " \
        "root=/dev/ram rw ramdisk_size=4096 " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm fe000000 fe100000"
 #endif
 
@@ -67,8 +67,8 @@
 #define CONFIG_BOOTCOMMAND \
        "bootp; " \
        "setenv bootargs console=ttyS0,38400 debug " \
-       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 #endif
 
index a00cafbe2eea0878ce6bc593a019d9d67b8cebba..09d52ded9eeb58bfd10e53e9d497334d380c26d9 100644 (file)
@@ -58,7 +58,7 @@
 #define CONFIG_BOOTCOMMAND \
        "setenv bootargs console=ttyS0,38400 debug " \
        "root=/dev/ram rw ramdisk_size=4096 " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm ff800000 ff900000"
 #endif
 
@@ -67,8 +67,8 @@
 #define CONFIG_BOOTCOMMAND \
        "bootp; " \
        "setenv bootargs console=ttyS0,38400 debug " \
-       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 #endif
 
index 984115ae5f2231a9b5a540d07d4d747437ed78bc..0a10e3c75b4c0bdd6c5d9c97afaa95f880c455fd 100644 (file)
 #undef CONFIG_BOOTARGS
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
                "panic=1\0"                                             \
        "bootfile=/tftpboot/vmlinux.srec\0"                             \
-       "load=tftp 80500000 $(u-boot)\0"                                \
+       "load=tftp 80500000 ${u-boot}\0"                                \
        ""
 
 #ifdef CONFIG_DBAU1550
index b483f407d2ed3f04f5e35744a75dc3d6408cfe23..8ff963f55a2ff9d7b5f3a75fa4c222dea2438db1 100644 (file)
@@ -45,9 +45,9 @@
 #define CONFIG_BOOTCOMMAND \
        "tftp 800000 pImage; " \
        "setenv bootargs console=ttyS0,9600 init=/linuxrc " \
-       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):" \
-       "$(netmask):$(hostname):eth0:none " \
+       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:" \
+       "${netmask}:${hostname}:eth0:none " \
        "mtdparts=phys:12m(root),-(kernel); " \
        "bootm 800000"
 
index 8eb4697df7ad9dc773840f67077c50d19ed788eb..a26af6952ef89e5498bcbd75e89f86fc2ce110a2 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=ebony\0"                                              \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/ebony/uImage\0"                             \
index 1486377caa9b5f102095d109e0b97fbd87f64b6b..91117bab726242f00eeb9a5253e86dca829bc46b 100644 (file)
@@ -55,8 +55,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index a69a304a10f6fefa35d7193b18df42b5088e004c..cfaf1532233264ec1091ada20b30e260d16cbe0f 100644 (file)
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr}\0"                                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        ""
 
index 0f548a52a244720c54a28c8cbe2df84814ec57cc..1c6216be843e89f037e0f373992e77e21730eff8 100644 (file)
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off\0"                          \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
-               "ethaddr=$(ethaddr) "                                   \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off\0"                          \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
+               "ethaddr=${ethaddr} "                                   \
                "panic=1\0"                                             \
        "flash_nfs=run nfsargs addip addmisc;"                          \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addmisc;"                         \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 80500000 $(bootfile);"                            \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 80500000 ${bootfile};"                            \
                "run nfsargs addip addmisc;bootm\0"                     \
        "rootpath=/opt/eldk/mips_4KC\0"                                 \
        "bootfile=/tftpboot/INCA/uImage\0"                              \
        "kernel_addr=B0040000\0"                                        \
        "ramdisk_addr=B0100000\0"                                       \
        "u-boot=/tftpboot/INCA/u-boot.bin\0"                            \
-       "load=tftp 80500000 $(u-boot)\0"                                \
+       "load=tftp 80500000 ${u-boot}\0"                                \
        "update=protect off 1:0-2;era 1:0-2;"                           \
-               "cp.b 80500000 B0000000 $(filesize)\0"                  \
+               "cp.b 80500000 B0000000 ${filesize}\0"                  \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
index 489901ce72aea406ed552392378c5085d451a2c6..c0cc4f1fbecc88926dff31cf5ee58e9616ca899b 100644 (file)
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr}\0"                                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        ""
 
index 04d7d8a28280b4b5dfd1ed03fffc517dc578ae0d..325f6547761972897fdb2c6b99a6c20d802b2df3 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/eldk/ppc_82xx\0"                                 \
        "bootfile=/tftpboot/MPC5200/uImage\0"                           \
        ""
index 49dd4878cb2434e3d8ad31a0fa2f110e1d286797..a13d6a870abc921a87ffdbfce889e5a21d6dc758 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=ocotea\0"                                             \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/ocotea/uImage\0"                            \
index f7de99b46468c05e63cb81915ae7fd82aaaa5ea9..ed1893f574229d8cd09ad0b1a344f3feb0bee1f2 100644 (file)
 #undef CONFIG_BOOTARGS
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
                "panic=1\0"                                             \
        "bootfile=/vmlinux.img\0"                               \
-       "load=tftp 80500000 $(u-boot)\0"                                \
+       "load=tftp 80500000 ${u-boot}\0"                                \
        ""
 /* Boot from NFS root */
-#define CONFIG_BOOTCOMMAND     "bootp; setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; bootm"
+#define CONFIG_BOOTCOMMAND     "bootp; setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; bootm"
 
 /*
  * Miscellaneous configurable options
index e261e5367a5f7d63b2a0afb994b034729c079a53..73aa3a88259a4d7334d93a7230d157e854cfa71c 100644 (file)
@@ -56,8 +56,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp;"                                                                \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 385e6d71821c55bde7482603e083fc47d3567ede..fefdb3cca0121caa349f1fa26472d6f03fb48cde 100644 (file)
        "netdev=eth0\0" \
        "flash_vxworks0=run ata_vxworks_args;setenv loadaddr ff000000;bootvx\0" \
        "flash_vxworks1=run ata_vxworks_args;setenv loadaddr ff200000:bootvx\0" \
-       "net_vxworks=phypower 1;sleep 2;tftp $(loadaddr) $(image);run vxworks_args;bootvx\0" \
-       "vxworks_args=setenv bootargs fec(0,0)$(host):$(image) h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script)\0" \
-       "ata_vxworks_args=setenv bootargs /ata0/vxWorks h=$(serverip) e=$(ipaddr) g=$(gatewayip) u=$(user) $(pass) tn=$(target) s=$(script) o=fec0 \0" \
+       "net_vxworks=phypower 1;sleep 2;tftp ${loadaddr} ${image};run vxworks_args;bootvx\0" \
+       "vxworks_args=setenv bootargs fec(0,0)${host}:${image} h=${serverip} e=${ipaddr} g=${gatewayip} u=${user} ${pass} tn=${target} s=${script}\0" \
+       "ata_vxworks_args=setenv bootargs /ata0/vxWorks h=${serverip} e=${ipaddr} g=${gatewayip} u=${user} ${pass} tn=${target} s=${script} o=fec0 \0" \
        "loadaddr=01000000\0" \
        "serverip=192.168.2.99\0" \
        "gatewayip=10.0.0.79\0" \
index 60b0b3713b792ab08df0f6de280ebded7cc26dae..757922210244c0c2f8fe934853694f71a8081879 100644 (file)
        "echo;" \
        "bootp;" \
        "setenv bootargs root=/dev/ram0 rw " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_INITRD */
 
        "version;" \
        "echo;" \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_NFS */
 
index 7ffd3fd36f87f5c0bc7a4611db1d8985262fa20c..2ecb7fb2bf73e8607fea9012dd8899d10fe07e39 100644 (file)
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off\0"                          \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
-               "ethaddr=$(ethaddr) "                                   \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off\0"                          \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
+               "ethaddr=${ethaddr} "                                   \
                "panic=1\0"                                             \
        "flash_nfs=run nfsargs addip addmisc;"                          \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addmisc;"                         \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 80500000 $(bootfile);"                            \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 80500000 ${bootfile};"                            \
                "run nfsargs addip addmisc;bootm\0"                     \
        "rootpath=/opt/eldk/mips_5KC\0"                                 \
        "bootfile=/tftpboot/purple/uImage\0"                            \
        "kernel_addr=B0040000\0"                                        \
        "ramdisk_addr=B0100000\0"                                       \
        "u-boot=/tftpboot/purple/u-boot.bin\0"                          \
-       "load=tftp 80500000 $(u-boot)\0"                                \
+       "load=tftp 80500000 ${u-boot}\0"                                \
        "update=protect off 1:0-4;era 1:0-4;"                           \
-               "cp.b 80500000 B0000000 $(filesize)\0"                  \
+               "cp.b 80500000 B0000000 ${filesize}\0"                  \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
index a38ec6232205e17547fb318a3d130d442b584908..21ec5acadefd545ffe43fd4501a4b6aeac1d8562 100644 (file)
@@ -65,9 +65,9 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
     "serial#=12345\0"          \
-       "nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath)\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)::off\0"
+    "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0"
 
 /*
  * Select the more full-featured memory test (Barr embedded systems)
index b67c41877c1d08ad9467dd5d0540b59726f0c590..b319cf497d3e8e9d1ca231cf3c704bad0c3a4058 100644 (file)
@@ -52,8 +52,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 031eba597de8394f7267e231720e529330f16b9a..4e0cfdb4c36244a81eabf1261a50d196d5f590ee 100644 (file)
     "tftpboot 0x140000 /bdi2000/u-boot.bin; " \
     "protect off 60000000 6003FFFF; " \
     "erase 60000000 6003FFFF; " \
-    "cp.b 140000 60000000 $(filesize); " \
+    "cp.b 140000 60000000 ${filesize}; " \
     "protect on 60000000 6003FFFF\0" \
 "copyenv="\
     "protect off 60040000 6004FFFF; " \
     "echo\\;" \
     "bootp\\;" \
     "setenv bootargs root=/dev/ram0 rw quiet " \
-    "ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
+    "ip=\\${ipaddr}:\\${serverip}:\\${gatewayip}:\\${netmask}:\\${hostname}::off\\;" \
     "run boot-hook\\;" \
     "bootm\0" \
 "root-on-initrd-debug="\
     "echo\\;" \
     "bootp\\;" \
     "setenv bootargs root=/dev/ram0 rw debug " \
-    "ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
+    "ip=\\${ipaddr}:\\${serverip}:\\${gatewayip}:\\${netmask}:\\${hostname}::off\\;" \
     "run debug-hook\\;" \
     "run boot-hook\\;" \
     "bootm\0" \
     "echo\\;" \
     "bootp\\;" \
     "setenv bootargs root=/dev/nfs rw quiet " \
-    "nfsroot=\\$(serverip):\\$(rootpath) " \
-    "ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
+    "nfsroot=\\${serverip}:\\${rootpath} " \
+    "ip=\\${ipaddr}:\\${serverip}:\\${gatewayip}:\\${netmask}:\\${hostname}::off\\;" \
     "run boot-hook\\;" \
     "bootm\0" \
 "root-on-nfs-debug="\
     "echo\\;" \
     "bootp\\;" \
     "setenv bootargs root=/dev/nfs rw debug " \
-    "nfsroot=\\$(serverip):\\$(rootpath) " \
-    "ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
+    "nfsroot=\\${serverip}:\\${rootpath} " \
+    "ip=\\${ipaddr}:\\${serverip}:\\${gatewayip}:\\${netmask}:\\${hostname}::off\\;" \
     "run debug-hook\\;" \
     "run boot-hook\\;" \
     "bootm\0" \
     "setenv checkhostname;" \
     "setenv ethaddr 00:09:70:00:00:01;" \
     "bootp;" \
-    "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) debug " \
-    "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+    "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} debug " \
+    "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
     "run debug-hook;" \
     "run boot-hook;" \
     "bootm\0" \
 "debug-hook="\
-    "echo ipaddr    $(ipaddr);" \
-    "echo serverip  $(serverip);" \
-    "echo gatewayip $(gatewayip);" \
-    "echo netmask   $(netmask);" \
-    "echo hostname  $(hostname)\0" \
+    "echo ipaddr    ${ipaddr};" \
+    "echo serverip  ${serverip};" \
+    "echo gatewayip ${gatewayip};" \
+    "echo netmask   ${netmask};" \
+    "echo hostname  ${hostname}\0" \
 "ana=run adc ; run dac\0" \
 "adc=run adc-12 ; run adc-34\0" \
 "adc-12=echo ### ADC-12 ; imd.b e 81 e\0" \
        "echo;" \
        "bootp;" \
        "setenv bootargs root=/dev/ram0 rw quiet " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "run boot-hook;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_INITRD */
        "version;" \
        "echo;" \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) quiet " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} quiet " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "run boot-hook;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_NFS */
index 725b4937b3243931b5e2edebbbdde4da63a67a1d..beff28ab32f51c6d7663ca06d43b05ea9750377c 100644 (file)
 #define CONFIG_PREBOOT "echo;echo Welcome to U-Boot for the sbc405;echo;echo Type \"? or help\" to get on-line help;echo"
 
 #define CONFIG_RAMBOOT                                                         \
-       "setenv bootargs root=/dev/ram rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/ram rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm ffc00000 ffca0000"
 #define CONFIG_NFSBOOT                                                         \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm ffc00000"
 
 #undef CONFIG_BOOTARGS
-#define CONFIG_BOOTCOMMAND      "version;echo;tftpboot $(loadaddr) $(loadfile);bootvx"      /* autoboot command     */
+#define CONFIG_BOOTCOMMAND      "version;echo;tftpboot ${loadaddr} ${loadfile};bootvx"      /* autoboot command     */
 
 
 #define CONFIG_MII             1       /* MII PHY management           */
        "env_endaddr=FF03FFFF\0" \
        "loadfile=vxWorks.st\0" \
        "loadaddr=0x01000000\0" \
-       "net_load=tftpboot $(loadaddr) $(loadfile)\0" \
+       "net_load=tftpboot ${loadaddr} ${loadfile}\0" \
        "uboot_startaddr=FFFC0000\0" \
        "uboot_endaddr=FFFFFFFF\0" \
-       "update=tftp $(loadaddr) u-boot.bin;" \
-               "protect off $(uboot_startaddr) $(uboot_endaddr);" \
-               "era $(uboot_startaddr) $(uboot_endaddr);" \
-               "cp.b $(loadaddr) $(uboot_startaddr) $(filesize);" \
-               "protect on $(uboot_startaddr) $(uboot_endaddr)\0" \
-       "zapenv=protect off $(env_startaddr) $(env_endaddr);" \
-               "era $(env_startaddr) $(env_endaddr);" \
-               "protect on $(env_startaddr) $(env_endaddr)\0"
+       "update=tftp ${loadaddr} u-boot.bin;" \
+               "protect off ${uboot_startaddr} ${uboot_endaddr};" \
+               "era ${uboot_startaddr} ${uboot_endaddr};" \
+               "cp.b ${loadaddr} ${uboot_startaddr} ${filesize};" \
+               "protect on ${uboot_startaddr} ${uboot_endaddr}\0" \
+       "zapenv=protect off ${env_startaddr} ${env_endaddr};" \
+               "era ${env_startaddr} ${env_endaddr};" \
+               "protect on ${env_startaddr} ${env_endaddr}\0"
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
index 45e4494ec616d5f78935c828a03231ebedff630c..180ce057d7921fda1e5408cf7690abe8ba938586 100644 (file)
  *
  * => printenv bootcmd
  * bootcmd=version;echo;bootp;setenv bootargs root=/dev/nfs rw
- * nfsroot=$(serverip):$(rootpath)
- * ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;run boot-hook;bootm
+ * nfsroot=${serverip}:${rootpath}
+ * ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;run boot-hook;bootm
  *
  * => run root-on-initrd
  * => printenv bootcmd
  * bootcmd=version;echo;bootp;setenv bootargs root=/dev/ram0 rw
- * ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;run boot-hook;bootm
+ * ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;run boot-hook;bootm
  *
  * => run root-on-nfs
  * => printenv bootcmd
  * bootcmd=version;echo;bootp;setenv bootargs root=/dev/nfs rw
- * nfsroot=$(serverip):$(rootpath)
- * ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;run boot-hook;bootm
+ * nfsroot=${serverip}:${rootpath}
+ * ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;run boot-hook;bootm
  *
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
                "tftpboot 0x140000 /bdi2000/u-boot.bin;" \
                "protect off 1:0;" \
                "erase 1:0;" \
-               "cp.b 140000 40000000 $(filesize);" \
+               "cp.b 140000 40000000 ${filesize};" \
                "protect on 1:0\0" \
        "zapenv="\
                "protect off 1:1;" \
                "echo;" \
                "bootp;" \
                "setenv bootargs root=/dev/ram0 rw " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
                "run boot-hook;" \
                "bootm\0" \
        "root-on-nfs="\
                "echo;" \
                "bootp;" \
                "setenv bootargs root=/dev/nfs rw " \
-               "nfsroot=$(serverip):$(rootpath) " \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+               "nfsroot=${serverip}:${rootpath} " \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
                "run boot-hook;" \
                "bootm\0" \
        "boot-hook=echo\0"
        "echo;" \
        "bootp;" \
        "setenv bootargs root=/dev/ram0 rw " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_INITRD */
 
        "version;" \
        "echo;" \
        "bootp;" \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;" \
        "bootm"
 #endif /* CONFIG_BOOT_ROOT_NFS */
 
index 0dab9b0f508a86f1adc6c1b5c3ae1a12ade3bf29..96cb6e4c7af02a3820277de940081e13d5aa23df 100644 (file)
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
-       "addip=setenv bootargs $(bootargs) "                            \
-               "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask)"      \
-               ":$(hostname):$(netdev):off panic=1\0"                  \
+               "nfsroot=${serverip}:${rootpath}\0"                     \
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
        "flash_self=run ramargs addip;"                                 \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "flash_nfs=run nfsargs addip;"                                  \
-               "bootm $(kernel_addr)\0"                                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"     \
+               "bootm ${kernel_addr}\0"                                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip;bootm\0"     \
        "bootfile=/tftpboot/tqm5200/uImage\0"                           \
-       "load=tftp 200000 $(u-boot)\0"                                  \
+       "load=tftp 200000 ${u-boot}\0"                                  \
        "u-boot=/tftpboot/tqm5200/u-boot.bin"   CONFIG_U_BOOT_SUFFIX    \
        "update=protect off FC000000 FC05FFFF;"                         \
                "erase FC000000 FC05FFFF;"                              \
-               "cp.b 200000 FC000000 $(filesize);"                     \
+               "cp.b 200000 FC000000 ${filesize};"                     \
                "protect on FC000000 FC05FFFF\0"                        \
        ""
 
index 9589050a6d130a015cdc5e86612bb1647226aa20..7118f3f74be7380d94fa2ab527e82d7e5bab5f52 100644 (file)
 #undef CONFIG_BOOTARGS
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-        "nfsroot=$(serverip):$(rootpath)\0"                     \
+        "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"                  \
+       "addip=setenv bootargs ${bootargs} "                            \
+              "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
                "flash_nfs=run nfsargs addip;"                                  \
-            "bootm $(kernel_addr)\0"                                \
+            "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip;"                                 \
-              "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 0x210000 $(bootfile);run nfsargs addip;bootm\0"     \
+              "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 0x210000 ${bootfile};run nfsargs addip;bootm\0"     \
        "rootpath=/opt/sinovee/ppc8xx-linux-2.0/target\0"                                  \
        "bootfile=pImage-sc855t\0"                           \
        "kernel_addr=48000000\0"                                        \
        "ramdisk_addr=48100000\0"                                       \
        ""
 #define CONFIG_BOOTCOMMAND                                                     \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "tftpboot 0x210000 pImage-sc855t;bootm 0x210000"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 5a20473dd5775ba9f5c94db952e7055346fe9d7f..dac1eb736d8934ad8e6fd8a884465645d5b6e358 100644 (file)
        "netboot=dhcp;tftp;run netargs; bootm\0"                        \
        "nfsargs=setenv bootargs root=/dev/nfs ip=dhcp\0"               \
        "localargs=setenv bootargs root=1F02 ip=dhcp\0"                 \
-       "addmisc=setenv bootargs $(bootargs) "                          \
-               "console=ttyS0,$(baudrate) "                            \
+       "addmisc=setenv bootargs ${bootargs} "                          \
+               "console=ttyS0,${baudrate} "                            \
                "read-only=readonly\0"                                  \
        "netargs=run nfsargs addmisc\0"                                 \
        "flash_nfs=run nfsargs addmisc;"                                \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_local=run localargs addmisc;"                            \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "netboot_initrd=dhcp;tftp;tftp 80600000 initrd;"                \
                "setenv bootargs root=/dev/ram ramdisk_size=8192 ip=dhcp;"\
                "run addmisc;"                                          \
        "ramdisk_addr=B0100000\0"                                       \
        "u-boot=u-boot.bin\0"                                           \
        "bootfile=uImage\0"                                             \
-       "load=dhcp;tftp 80400000 $(u-boot)\0"                           \
-       "load_kernel=dhcp;tftp 80400000 $(bootfile)\0"                  \
+       "load=dhcp;tftp 80400000 ${u-boot}\0"                           \
+       "load_kernel=dhcp;tftp 80400000 ${bootfile}\0"                  \
        "update_uboot=run load;"                                        \
                "protect off BFC00000 BFC3FFFF;"                        \
                "erase BFC00000 BFC3FFFF;"                              \
-               "cp.b 80400000 BFC00000 $(filesize)\0"                  \
+               "cp.b 80400000 BFC00000 ${filesize}\0"                  \
        "update_kernel=run load_kernel;"                                \
                "erase BFC60000 BFD5FFFF;"                              \
-               "cp.b 80400000 BFC60000 $(filesize)\0"                  \
+               "cp.b 80400000 BFC60000 ${filesize}\0"                  \
        "initenv=erase bfc40000 bfc5ffff\0"                             \
        ""
 /*#define CONFIG_BOOTCOMMAND   "run flash_local" */
index 7fd3e466e7f628c8a430b937603193cdc834bf95..85ee756e05fe18667011ac75b84f8c7e26e3879f 100644 (file)
 #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"
 #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"
index 187df71ddb09a10386a75b509d5d30ebdad4206d..c4e629ade2bec799d546a509442ca1c004c97582 100644 (file)
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_8xx\0"                                  \
        "bootfile=/tftpboot/uc100/uImage\0"                             \
@@ -86,7 +86,7 @@
        "ramdisk_addr=40100000\0"                                       \
        "load=tftp 100000 /tftpboot/uc100/u-boot.bin\0"                 \
        "update=protect off 40700000 4073ffff;era 40700000 4073ffff;"   \
-               "cp.b 100000 40700000 $(filesize);"                     \
+               "cp.b 100000 40700000 ${filesize};"                     \
                "setenv filesize;saveenv\0"                             \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
index 4c4c279fa185e1e9cb1f8b08963a50663bd7195e..d312b6559ad3cc2b6969fd7fec8ad9c846ff582e 100644 (file)
        "ramdisk_addr=FF800000\0" \
        "u-boot_startaddr=FFB00000\0" \
        "u-boot_endaddr=FFB2FFFF\0" \
-       "nfsargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/nfs rw \
-nfsroot=$(nfsrootip):$(rootpath) ip=dhcp\0" \
-       "ramargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/ram0\0" \
-       "smargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/mtdblock1 ro\0" \
-       "fwargs=setenv bootargs console=ttyS0,$(baudrate) root=/dev/sda2 ro\0" \
-       "nfsboot=run nfsargs;bootm $(kernel_addr)\0" \
-       "ramboot=run ramargs;bootm $(kernel_addr) $(ramdisk_addr)\0" \
-       "smboot=run smargs;bootm $(kernel_addr) $(ramdisk_addr)\0" \
-       "fwboot=run fwargs;bootm $(kernel_addr) $(ramdisk_addr)\0" \
-       "update_u-boot=tftp $(loadaddr) /bdi2000/u-boot.bin;protect off \
-$(u-boot_startaddr) $(u-boot_endaddr);era $(u-boot_startaddr) \
-$(u-boot_endaddr);cp.b $(loadaddr) $(u-boot_startaddr) $(filesize);\
-protect on $(u-boot_startaddr) $(u-boot_endaddr)"
+       "nfsargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/nfs rw \
+nfsroot=${nfsrootip}:${rootpath} ip=dhcp\0" \
+       "ramargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/ram0\0" \
+       "smargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/mtdblock1 ro\0" \
+       "fwargs=setenv bootargs console=ttyS0,${baudrate} root=/dev/sda2 ro\0" \
+       "nfsboot=run nfsargs;bootm ${kernel_addr}\0" \
+       "ramboot=run ramargs;bootm ${kernel_addr} ${ramdisk_addr}\0" \
+       "smboot=run smargs;bootm ${kernel_addr} ${ramdisk_addr}\0" \
+       "fwboot=run fwargs;bootm ${kernel_addr} ${ramdisk_addr}\0" \
+       "update_u-boot=tftp ${loadaddr} /bdi2000/u-boot.bin;protect off \
+${u-boot_startaddr} ${u-boot_endaddr};era ${u-boot_startaddr} \
+${u-boot_endaddr};cp.b ${loadaddr} ${u-boot_startaddr} ${filesize};\
+protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 
 #define CONFIG_ENV_OVERWRITE
 
index b3c62556d2a640835fd17e2dcebcd622db27514e..a2e99b59e2a02f7c98bacc1918ad12eed70e793a 100644 (file)
@@ -65,8 +65,8 @@
 #define CONFIG_BOOTCOMMAND                                                     \
        "tftpboot; "                                                            \
        "setenv bootargs console=tty0 "                                   \
-       "root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "                     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "                     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
index 72b0a4c8e8b4853a875a525dca8df7c3c3252ae3..c5ee78ff4d71b5ef41f414565f1c6f7bebee5161 100644 (file)
 #define CFG_AUTOLOAD           "n"     /* no autoload */
 #define CONFIG_PREBOOT         "run setup"
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
-       "setup=setenv bootargs console=ttyS0,$(baudrate) "      \
+       "setup=setenv bootargs console=ttyS0,${baudrate} "      \
                "root=/dev/nfs ip=dhcp\0"                       \
        "update=erase c000000 c03ffff; "                        \
-               "cp.b 10400000 c000000 $(filesize)\0"
+               "cp.b 10400000 c000000 ${filesize}\0"
 #else
 #define CONFIG_BOOTDELAY       3
 #undef  CONFIG_BOOTARGS                /* boot command will set bootargs */
index 6dbce5788c42bfc2a25b56903536cade5c6dc9b2..1171ee5ae5130094e217663353213b98c1a4d853 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=walnut\0"                                             \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/walnut/uImage\0"                            \
index 092959e3372ed5486907dd94c514dcc51a8bfe0f..d3e9671bc31a28d7571bfa02ded2df254f3c4f11 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=yellowstone\0"                                        \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/yellowstone/uImage\0"                       \
index d2bba98d00d67520c4bd5b6fd1cc0914fa0ca295..a67b834866ba9869f231ca2465e1a396f04dc8d1 100644 (file)
        "netdev=eth0\0"                                                 \
        "hostname=yosemite\0"                                           \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=$(serverip):$(rootpath)\0"                     \
+               "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"                  \
-       "addtty=setenv bootargs $(bootargs) console=ttyS0,$(baudrate)\0"\
+       "addip=setenv bootargs ${bootargs} "                            \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
+               ":${hostname}:${netdev}:off panic=1\0"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "flash_nfs=run nfsargs addip addtty;"                           \
-               "bootm $(kernel_addr)\0"                                \
+               "bootm ${kernel_addr}\0"                                \
        "flash_self=run ramargs addip addtty;"                          \
-               "bootm $(kernel_addr) $(ramdisk_addr)\0"                \
-       "net_nfs=tftp 200000 $(bootfile);run nfsargs addip addtty;"     \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
                "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=/tftpboot/yosemite/uImage\0"                          \
index cc2ff09572e8fed800a44c556d9ed9ac74988d6f..13c45a278092f9f97af51d99c120f03d37bda6f0 100644 (file)
@@ -43,8 +43,8 @@
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs nfsroot=$(serverip):$(rootpath) "        \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} "        \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 extern         void  fw_printenv(int argc, char *argv[]);