Support for redundant environment in NAND Flash.

[oweals/u-boot.git] / include / configs / VoVPN-GW.h

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index 05f6f1898b210151d04b3a97da1f0e40353a965e..92bade5187e13911bf15b1a190aac59053769187 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -165,18 +165,18 @@
 #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" \
@@ -261,7 +261,7 @@
  * have to be in the first 8 MB of memory, since this is
  * the maximum mapped by the Linux kernel during initialization.
  */
-#define CFG_BOOTMAPSZ                  (8 << 20)   
+#define CFG_BOOTMAPSZ                  (8 << 20)
 
 /* hard reset configuration words */
 #ifdef CONFIG_CLKIN_66MHz
@@ -342,13 +342,13 @@
 
 /* TMCNTSC - time counter status and control */
 /* clear interrupts XXX jse */
-//#define CFG_TMCNTSC                  (TMCNTSC_SEC|TMCNTSC_ALR)
+/*#define CFG_TMCNTSC                  (TMCNTSC_SEC|TMCNTSC_ALR) */
 #define CFG_TMCNTSC                    (TMCNTSC_SEC|TMCNTSC_ALR|\
                                         TMCNTSC_TCF|TMCNTSC_TCE)
 
 /* PISCR - periodic interrupt status and control */
 /* clear interrupts XXX jse */
-//#define CFG_PISCR                    (PISCR_PS)
+/*#define CFG_PISCR                    (PISCR_PS) */
 #define CFG_PISCR                      (PISCR_PS|PISCR_PTF|PISCR_PTE)
 
 /* SCCR - system clock control */
@@ -397,7 +397,7 @@
 #define CFG_OR7_PRELIM                 0xffff8104
 #define CFG_MPTPR                      0x2700
 #define CFG_PSDMR                      0x822a2452      /* optimal */
-//#define CFG_PSDMR                    0x822a48a3      /* relaxed */
+/*#define CFG_PSDMR                    0x822a48a3 */   /* relaxed */
 #define CFG_PSRT                       0x1a
 
 /* "bad" address */