summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/BC3450.h2
-rw-r--r--include/configs/CPC45.h2
-rw-r--r--include/configs/CPU86.h2
-rw-r--r--include/configs/CPU87.h2
-rw-r--r--include/configs/CU824.h2
-rw-r--r--include/configs/DB64360.h2
-rw-r--r--include/configs/DB64460.h2
-rw-r--r--include/configs/FPS850L.h2
-rw-r--r--include/configs/FPS860L.h2
-rw-r--r--include/configs/HMI10.h2
-rw-r--r--include/configs/IAD210.h2
-rw-r--r--include/configs/ICU862.h2
-rw-r--r--include/configs/IDS8247.h2
-rw-r--r--include/configs/IP860.h2
-rw-r--r--include/configs/IceCube.h2
-rw-r--r--include/configs/MPC832XEMDS.h2
-rw-r--r--include/configs/MPC8349EMDS.h4
-rw-r--r--include/configs/MPC8360EMDS.h2
-rw-r--r--include/configs/MPC837XEMDS.h12
-rw-r--r--include/configs/MPC837XERDB.h2
-rw-r--r--include/configs/NC650.h2
-rw-r--r--include/configs/NETTA.h2
-rw-r--r--include/configs/NETVIA.h2
-rw-r--r--include/configs/NSCU.h2
-rw-r--r--include/configs/P3G4.h4
-rw-r--r--include/configs/PM520.h2
-rw-r--r--include/configs/PM826.h2
-rw-r--r--include/configs/PM828.h2
-rw-r--r--include/configs/QS860T.h2
-rw-r--r--include/configs/R360MPI.h2
-rw-r--r--include/configs/RBC823.h2
-rw-r--r--include/configs/SCM.h2
-rw-r--r--include/configs/TB5200.h2
-rw-r--r--include/configs/TK885D.h2
-rw-r--r--include/configs/TOP5200.h2
-rw-r--r--include/configs/TQM823L.h2
-rw-r--r--include/configs/TQM823M.h2
-rw-r--r--include/configs/TQM8260.h2
-rw-r--r--include/configs/TQM8272.h4
-rw-r--r--include/configs/TQM834x.h4
-rw-r--r--include/configs/TQM850L.h2
-rw-r--r--include/configs/TQM850M.h2
-rw-r--r--include/configs/TQM855L.h2
-rw-r--r--include/configs/TQM855M.h2
-rw-r--r--include/configs/TQM85xx.h2
-rw-r--r--include/configs/TQM860L.h2
-rw-r--r--include/configs/TQM860M.h2
-rw-r--r--include/configs/TQM862L.h2
-rw-r--r--include/configs/TQM862M.h2
-rw-r--r--include/configs/TQM866M.h2
-rw-r--r--include/configs/TQM885D.h2
-rw-r--r--include/configs/Total5200.h2
-rw-r--r--include/configs/acadia.h2
-rw-r--r--include/configs/ads5121.h45
-rw-r--r--include/configs/aev.h2
-rw-r--r--include/configs/alpr.h2
-rw-r--r--include/configs/atc.h2
-rw-r--r--include/configs/bamboo.h4
-rw-r--r--include/configs/bubinga.h4
-rw-r--r--include/configs/c2mon.h2
-rw-r--r--include/configs/canmb.h2
-rw-r--r--include/configs/ebony.h4
-rw-r--r--include/configs/hcu4.h4
-rw-r--r--include/configs/hcu5.h2
-rw-r--r--include/configs/hmi1001.h2
-rw-r--r--include/configs/idmr.h2
-rw-r--r--include/configs/incaip.h2
-rw-r--r--include/configs/inka4x0.h2
-rw-r--r--include/configs/ixdpg425.h4
-rw-r--r--include/configs/jupiter.h2
-rw-r--r--include/configs/katmai.h4
-rw-r--r--include/configs/kilauea.h2
-rw-r--r--include/configs/korat.h4
-rw-r--r--include/configs/luan.h4
-rw-r--r--include/configs/lwmon5.h2
-rw-r--r--include/configs/makalu.h2
-rw-r--r--include/configs/mcc200.h2
-rw-r--r--include/configs/mgcoge.h35
-rw-r--r--include/configs/mgsuvd.h14
-rw-r--r--include/configs/mpc7448hpc2.h3
-rw-r--r--include/configs/o2dnt.h2
-rw-r--r--include/configs/ocotea.h4
-rw-r--r--include/configs/p3mx.h2
-rw-r--r--include/configs/p3p440.h4
-rw-r--r--include/configs/pcs440ep.h8
-rw-r--r--include/configs/pdnb3.h4
-rw-r--r--include/configs/purple.h2
-rw-r--r--include/configs/sbc8349.h2
-rw-r--r--include/configs/sbc8548.h2
-rw-r--r--include/configs/sc3.h2
-rw-r--r--include/configs/sequoia.h28
-rw-r--r--include/configs/smmaco4.h2
-rw-r--r--include/configs/sorcery.h2
-rw-r--r--include/configs/spieval.h2
-rw-r--r--include/configs/taihu.h4
-rw-r--r--include/configs/taishan.h4
-rw-r--r--include/configs/tb0229.h8
-rw-r--r--include/configs/uc100.h2
-rw-r--r--include/configs/uc101.h2
-rw-r--r--include/configs/v37.h2
-rw-r--r--include/configs/v38b.h2
-rw-r--r--include/configs/virtlab2.h2
-rw-r--r--include/configs/walnut.h4
-rw-r--r--include/configs/yosemite.h4
-rw-r--r--include/configs/yucca.h6
105 files changed, 235 insertions, 154 deletions
diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 5c2bfc9..3d09ee7 100644
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -215,7 +215,7 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo;"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index aea8523..11107d4 100644
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -50,7 +50,7 @@
#define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#define CONFIG_BOOTDELAY 5
diff --git a/include/configs/CPU86.h b/include/configs/CPU86.h
index c589f28..9763e64 100644
--- a/include/configs/CPU86.h
+++ b/include/configs/CPU86.h
@@ -110,7 +110,7 @@
#define CONFIG_PREBOOT \
"echo; " \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS; " \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS; " \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index b087eba..3879d9b 100644
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -114,7 +114,7 @@
#define CONFIG_PREBOOT \
"echo; " \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS; " \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS; " \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index 68e816a..8b50087 100644
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -50,7 +50,7 @@
#define CONFIG_BAUDRATE 9600
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#define CONFIG_BOOTCOMMAND "bootm FE020000" /* autoboot command */
#define CONFIG_BOOTDELAY 5
diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index db2e96c..eef216d 100644
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -169,7 +169,7 @@ if we use PCI it has its own MAC addr */
#undef CONFIG_BOOTARGS
-/*#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" */
+/*#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo" */
/* ronen - autoboot using tftp */
#if (CONFIG_BOOTDELAY >= 0)
diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index b5d3f77..b14cd0d 100644
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -107,7 +107,7 @@
#undef CONFIG_BOOTARGS
-/*#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" */
+/*#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo" */
/* ronen - autoboot using tftp */
#if (CONFIG_BOOTDELAY >= 0)
diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h
index 3b0ddb4..e4b68ab 100644
--- a/include/configs/FPS850L.h
+++ b/include/configs/FPS850L.h
@@ -47,7 +47,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h
index 6fec075..ed612c3 100644
--- a/include/configs/FPS860L.h
+++ b/include/configs/FPS860L.h
@@ -47,7 +47,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h
index f8b0262..081ca6c 100644
--- a/include/configs/HMI10.h
+++ b/include/configs/HMI10.h
@@ -60,7 +60,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/IAD210.h b/include/configs/IAD210.h
index bd0894c..7f3f16d 100644
--- a/include/configs/IAD210.h
+++ b/include/configs/IAD210.h
@@ -63,7 +63,7 @@
# define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#endif
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
/* using this define saves us updating another source file */
#define CONFIG_BOARD_EARLY_INIT_F 1
diff --git a/include/configs/ICU862.h b/include/configs/ICU862.h
index da54cef..9c88d7c 100644
--- a/include/configs/ICU862.h
+++ b/include/configs/ICU862.h
@@ -68,7 +68,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#endif
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/IDS8247.h b/include/configs/IDS8247.h
index bb87fae..f7d4499 100644
--- a/include/configs/IDS8247.h
+++ b/include/configs/IDS8247.h
@@ -43,7 +43,7 @@
#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index bd961d8..e6c7fe6 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -41,7 +41,7 @@
#define CONFIG_BAUDRATE 9600
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo" \
+#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"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 4c16d22..9b485a9 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -142,7 +142,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 702b073..f32c4f7 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -583,7 +583,7 @@
"ramdiskaddr=1000000\0" \
"ramdiskfile=ramfs.83xx\0" \
"fdtaddr=400000\0" \
- "fdtfile=mpc832xemds.dtb\0" \
+ "fdtfile=mpc832x_mds.dtb\0" \
""
#define CONFIG_NFSBOOTCOMMAND \
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 331f4c9..07fefec 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -717,7 +717,7 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#define CONFIG_EXTRA_ENV_SETTINGS \
@@ -739,7 +739,7 @@
"load=tftp 100000 /tftpboot/mpc8349emds/u-boot.bin\0" \
"update=protect off fe000000 fe03ffff; " \
"era fe000000 fe03ffff; cp.b 100000 fe000000 ${filesize}\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"fdtaddr=400000\0" \
"fdtfile=mpc8349emds.dtb\0" \
""
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index eff9fba..c8dcbc6 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -615,7 +615,7 @@
"ramdiskaddr=1000000\0" \
"ramdiskfile=ramfs.83xx\0" \
"fdtaddr=400000\0" \
- "fdtfile=mpc8360emds.dtb\0" \
+ "fdtfile=mpc836x_mds.dtb\0" \
""
#define CONFIG_NFSBOOTCOMMAND \
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 61de084..5586533 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -84,11 +84,19 @@
HRCWH_LDP_CLEAR)
#endif
+/* Arbiter Configuration Register */
+#define CFG_ACR_PIPE_DEP 3 /* Arbiter pipeline depth is 4 */
+#define CFG_ACR_RPTCNT 3 /* Arbiter repeat count is 4 */
+
+/* System Priority Control Register */
+#define CFG_SPCR_TSECEP 3 /* eTSEC1/2 emergency has highest priority */
+
/*
- * eTSEC Clock Config
+ * IP blocks clock configuration
*/
#define CFG_SCCR_TSEC1CM 1 /* CSB:eTSEC1 = 1:1 */
#define CFG_SCCR_TSEC2CM 1 /* CSB:eTSEC2 = 1:1 */
+#define CFG_SCCR_SATACM SCCR_SATACM_1 /* CSB:SATA[0:3] = 1:1 */
/*
* System IO Config
@@ -570,7 +578,7 @@
"ramdiskaddr=1000000\0" \
"ramdiskfile=ramfs.83xx\0" \
"fdtaddr=400000\0" \
- "fdtfile=mpc837xemds.dtb\0" \
+ "fdtfile=mpc8379_mds.dtb\0" \
""
#define CONFIG_NFSBOOTCOMMAND \
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2da4f29..1964946 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -545,7 +545,7 @@
#define CONFIG_RAMDISKFILE rootfs.ext2.gz.uboot
#define CONFIG_BOOTFILE uImage
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
-#define CONFIG_FDTFILE mpc837x_rdb.dtb
+#define CONFIG_FDTFILE mpc8379_rdb.dtb
#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
diff --git a/include/configs/NC650.h b/include/configs/NC650.h
index c051a35..5346545 100644
--- a/include/configs/NC650.h
+++ b/include/configs/NC650.h
@@ -72,7 +72,7 @@
#define CONFIG_BOOT_RETRY_TIME 900
#define CONFIG_BOOT_RETRY_MIN 30
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 19743c0..945f47f 100644
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -60,7 +60,7 @@
#undef CONFIG_CLOCKS_IN_MHZ /* clocks NOT passsed to Linux in MHz */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/NETVIA.h b/include/configs/NETVIA.h
index d4cb9e7..af5339e 100644
--- a/include/configs/NETVIA.h
+++ b/include/configs/NETVIA.h
@@ -59,7 +59,7 @@
#undef CONFIG_CLOCKS_IN_MHZ /* clocks NOT passsed to Linux in MHz */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 4cd4472..3929a84 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -48,7 +48,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index ef970f1..e85e1b9 100644
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -81,7 +81,7 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -110,7 +110,7 @@
"update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;" \
"cp.b 100000 fff00000 ${filesize};" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 5ba8f4a..d9405b0 100644
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -129,7 +129,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index c80b153..cf7314d 100644
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -43,7 +43,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 8f5be5f..abf593c 100644
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -43,7 +43,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 62cf2a4..c980901 100644
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -72,7 +72,7 @@
#undef CONFIG_CLOCKS_IN_MHZ /* clocks passsed to Linux in MHz */
#define CONFIG_PREBOOT "echo;" \
- "echo 'Type \"run flash_nfs\" to mount root filesystem over NFS';" \
+ "echo 'Type \\\"run flash_nfs\\\" to mount root filesystem over NFS';" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/R360MPI.h b/include/configs/R360MPI.h
index a98b4af..f4aecfc 100644
--- a/include/configs/R360MPI.h
+++ b/include/configs/R360MPI.h
@@ -58,7 +58,7 @@
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index fa32e33..e3c7561 100644
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -61,7 +61,7 @@
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
#define CONFIG_8xx_GCLK_FREQ 48000000L
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/SCM.h b/include/configs/SCM.h
index f900968..bc5389f 100644
--- a/include/configs/SCM.h
+++ b/include/configs/SCM.h
@@ -63,7 +63,7 @@
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h
index ae8d9ab..6cb3022 100644
--- a/include/configs/TB5200.h
+++ b/include/configs/TB5200.h
@@ -140,7 +140,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index c43fef6..50f1c63 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -58,7 +58,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 7240ce1..dea5ead 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -148,7 +148,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h
index be5b4d3..100be7c 100644
--- a/include/configs/TQM823L.h
+++ b/include/configs/TQM823L.h
@@ -51,7 +51,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h
index a0c01b6..40dc26b 100644
--- a/include/configs/TQM823M.h
+++ b/include/configs/TQM823M.h
@@ -51,7 +51,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM8260.h b/include/configs/TQM8260.h
index 3b78323..ced87b5 100644
--- a/include/configs/TQM8260.h
+++ b/include/configs/TQM8260.h
@@ -66,7 +66,7 @@
#define CONFIG_BAUDRATE 9600
#endif
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM8272.h b/include/configs/TQM8272.h
index 50f6752..ba0402d 100644
--- a/include/configs/TQM8272.h
+++ b/include/configs/TQM8272.h
@@ -56,7 +56,7 @@
#define CONFIG_BAUDRATE 115200
#endif
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
@@ -87,7 +87,7 @@
"cp.b 300000 40000000 40000;" \
"setenv filesize;saveenv\0" \
"cphwib=cp.b 4003fc00 33fc00 400\0" \
- "upd=run load;run cphwib;run update\0" \
+ "upd=run load cphwib update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 024ecfa..02a16ac 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -500,7 +500,7 @@ extern int tqm834x_num_flash_banks;
#define CONFIG_BAUDRATE 115200
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -528,7 +528,7 @@ extern int tqm834x_num_flash_banks;
"load=tftp 100000 /tftpboot/tqm834x/u-boot.bin\0" \
"update=protect off 80000000 8003ffff; " \
"era 80000000 8003ffff; cp.b 100000 80000000 40000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h
index f51b12e..3097bc3 100644
--- a/include/configs/TQM850L.h
+++ b/include/configs/TQM850L.h
@@ -47,7 +47,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h
index a725e71..becf82c 100644
--- a/include/configs/TQM850M.h
+++ b/include/configs/TQM850M.h
@@ -45,7 +45,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 16dc3eb..8ca8906 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -49,7 +49,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index c4b4599..2696ea5 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -49,7 +49,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index dd0654b..21e8baf 100644
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -468,7 +468,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index ac22c1e..f66aace 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -49,7 +49,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 8601de1..00b7853 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -49,7 +49,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 2bf4a2a..7813a20 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -52,7 +52,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index d42ffc9..05395e0 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -52,7 +52,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index d7e5eeb..d033875 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -61,7 +61,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 8a3aa4b..a254bcd 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -57,7 +57,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 9edf790..2e9a2bc 100644
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -149,7 +149,7 @@
#define CONFIG_PREBOOT \
"setenv stdout serial;setenv stderr serial;" \
"echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/acadia.h b/include/configs/acadia.h
index dc322dd..3cd5ad6 100644
--- a/include/configs/acadia.h
+++ b/include/configs/acadia.h
@@ -241,7 +241,7 @@
#define CONFIG_NETCONSOLE /* include NetConsole support */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index 09c3140..c147424 100644
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -34,6 +34,9 @@
* 0x3000_0000 - 0x3001_FFFF SRAM (128 KB)
* 0x8000_0000 - 0x803F_FFFF IMMR (4 MB)
* 0x8200_0000 - 0x8200_001F CPLD (32 B)
+ * 0x8400_0000 - 0x82FF_FFFF PCI I/O space (16 MB)
+ * 0xA000_0000 - 0xAFFF_FFFF PCI memory space (256 MB)
+ * 0xB000_0000 - 0xBFFF_FFFF PCI memory mapped I/O space (256 MB)
* 0xFC00_0000 - 0xFFFF_FFFF NOR Boot FLASH (64 MB)
*/
@@ -43,7 +46,7 @@
#define CONFIG_E300 1 /* E300 Family */
#define CONFIG_MPC512X 1 /* MPC512X family */
-#undef CONFIG_PCI
+/* CONFIG_PCI is defined at config time */
#define CFG_MPC512X_CLKIN 66000000 /* in Hz */
@@ -217,6 +220,31 @@
#define CFG_PROMPT_HUSH_PS2 "> "
#endif
+/*
+ * PCI
+ */
+#ifdef CONFIG_PCI
+
+/*
+ * General PCI
+ */
+#define CFG_PCI_MEM_BASE 0xA0000000
+#define CFG_PCI_MEM_PHYS CFG_PCI_MEM_BASE
+#define CFG_PCI_MEM_SIZE 0x10000000 /* 256M */
+#define CFG_PCI_MMIO_BASE (CFG_PCI_MEM_BASE + CFG_PCI_MEM_SIZE)
+#define CFG_PCI_MMIO_PHYS CFG_PCI_MMIO_BASE
+#define CFG_PCI_MMIO_SIZE 0x10000000 /* 256M */
+#define CFG_PCI_IO_BASE 0x00000000
+#define CFG_PCI_IO_PHYS 0x84000000
+#define CFG_PCI_IO_SIZE 0x01000000 /* 16M */
+
+
+#define CONFIG_PCI_PNP /* do pci plug-and-play */
+
+#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
+
+#endif
+
/* I2C */
#define CONFIG_HARD_I2C /* I2C with hardware support */
#undef CONFIG_SOFT_I2C /* so disable bit-banged I2C */
@@ -349,6 +377,7 @@
#define CONFIG_HOSTNAME ads5121
#define CONFIG_BOOTFILE ads5121/uImage
+#define CONFIG_ROOTPATH /opt/eldk/pcc_6xx
#define CONFIG_LOADADDR 400000 /* default location for tftp and bootm */
@@ -358,16 +387,16 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#define CONFIG_EXTRA_ENV_SETTINGS \
"u-boot_addr_r=200000\0" \
- "kernel_addr_r=200000\0" \
+ "kernel_addr_r=300000\0" \
"fdt_addr_r=400000\0" \
"ramdisk_addr_r=500000\0" \
"u-boot_addr=FFF00000\0" \
- "kernel_addr=FC000000\0" \
+ "kernel_addr=FC040000\0" \
"fdt_addr=FC2C0000\0" \
"ramdisk_addr=FC300000\0" \
"ramdiskfile=ads5121/uRamdisk\0" \
@@ -384,7 +413,7 @@
"addtty=setenv bootargs ${bootargs} " \
"console=${consdev},${baudrate}\0" \
"flash_nfs=run nfsargs addip addtty;" \
- "bootm ${kernel_addr_r} - ${fdt_addr}\0" \
+ "bootm ${kernel_addr} - ${fdt_addr}\0" \
"flash_self=run ramargs addip addtty;" \
"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
"net_nfs=tftp ${kernel_addr_r} ${bootfile};" \
@@ -393,10 +422,10 @@
"bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
"net_self=tftp ${kernel_addr_r} ${bootfile};" \
"tftp ${ramdisk_addr_r} ${ramdiskfile};" \
- "tftp ${fdt_addr} ${fdtfile};" \
+ "tftp ${fdt_addr_r} ${fdtfile};" \
"run ramargs addip addtty;" \
- "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr}\0"\
- "load=tftp ${u-boot_addr} ${u-boot}\0" \
+ "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0"\
+ "load=tftp ${u-boot_addr_r} ${u-boot}\0" \
"update=protect off ${u-boot_addr} +${filesize};" \
"era ${u-boot_addr} +${filesize};" \
"cp.b ${u-boot_addr_r} ${u-boot_addr} ${filesize}\0" \
diff --git a/include/configs/aev.h b/include/configs/aev.h
index 5bab793..0163025 100644
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -135,7 +135,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index cfe08c8..38fb7c6 100644
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -166,7 +166,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"ethprime=ppc_4xx_eth3\0" \
"ethact=ppc_4xx_eth3\0" \
"autoload=no\0" \
diff --git a/include/configs/atc.h b/include/configs/atc.h
index 3ff4b68..4ef50c2 100644
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -104,7 +104,7 @@
#define CONFIG_PREBOOT \
"echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;"\
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;"\
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index d577448..4ea040b 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -246,7 +246,7 @@
#endif /* CFG_ENV_IS_IN_EEPROM */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -276,7 +276,7 @@
"update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \
"cp.b 100000 fffa0000 60000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h
index eca195a..784e7c0 100644
--- a/include/configs/bubinga.h
+++ b/include/configs/bubinga.h
@@ -81,7 +81,7 @@
#endif
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -111,7 +111,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run net_nfs"
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index a9a5254..a5621b8 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -50,7 +50,7 @@
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
#define CONFIG_BOOTCOMMAND \
diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index d577b95..440972c 100644
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -88,7 +88,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/ebony.h b/include/configs/ebony.h
index 5faa9eb..88fd7ca 100644
--- a/include/configs/ebony.h
+++ b/include/configs/ebony.h
@@ -154,7 +154,7 @@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -184,7 +184,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h
index 9242d2c..5a85feb 100644
--- a/include/configs/hcu4.h
+++ b/include/configs/hcu4.h
@@ -161,7 +161,7 @@
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -192,7 +192,7 @@
"load=tftp 100000 hcu4/u-boot.bin\0" \
"update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;" \
"cp.b 100000 FFFB0000 50000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"vx_rom=hcu4/hcu4_vx_rom\0" \
"vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0" \
"vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}" \
diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h
index 8c26613..2ed8530 100644
--- a/include/configs/hcu5.h
+++ b/include/configs/hcu5.h
@@ -199,7 +199,7 @@
"load=tftp 100000 hcu5/u-boot.bin\0" \
"update=protect off FFFB0000 FFFFFFFF;era FFFB0000 FFFFFFFF;" \
"cp.b 100000 FFFB0000 50000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"vx_rom=hcu5/hcu5_vx_rom\0" \
"vx=tftp ${loadaddr} ${vx_rom};run vxargs; bootvx\0" \
"vxargs=setenv bootargs emac(0,0)c:${vx_rom} e=${ipaddr}" \
diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 6c15b4e..4347625 100644
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -88,7 +88,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 3821ebc..a15f69a 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -57,7 +57,7 @@
#define CONFIG_NETMASK 255.255.0.0
#define CONFIG_HOSTNAME idmr
#define CONFIG_BOOTFILE /tftpboot/idmr/uImage
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root " \
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root " \
"filesystem over NFS; echo"
#define CONFIG_MCFTMR
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 4caf54e..5ca00b3 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -48,7 +48,7 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 206007d..6f45c04 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -108,7 +108,7 @@
#define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index da59230..a3be0b5 100644
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -139,7 +139,7 @@
* Default configuration (environment varibles...)
*----------------------------------------------------------------------*/
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -168,7 +168,7 @@
"update=protect off 50000000 5003ffff;era 50000000 5003ffff;" \
"cp.b 100000 50000000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run net_nfs"
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index b7100e9..8c6075f 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -110,7 +110,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 78c794a..21b2604 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -173,7 +173,7 @@
#define CFG_ENV_IS_IN_FLASH 1 /* Environment uses flash */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -209,7 +209,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b ${fileaddr} fffc0000 ${filesize};" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"kozio=bootm ffc60000\0" \
"pciconfighost=1\0" \
"pcie_mode=RP:RP:RP\0" \
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index a1d1533..3f4b8e6 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -227,7 +227,7 @@
#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/korat.h b/include/configs/korat.h
index 7f2b09a..dcec9b0 100644
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -170,7 +170,7 @@
#define CFG_DTT_MIN_TEMP -30
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -202,7 +202,7 @@
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \
"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \
"cp.b 200000 FFFA0000 60000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/luan.h b/include/configs/luan.h
index cba7295..af237d9 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -152,7 +152,7 @@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -182,7 +182,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index 97e8bf1..c3f10c7 100644
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -219,7 +219,7 @@
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \
"update=protect off FFF80000 FFFFFFFF;era FFF80000 FFFFFFFF;" \
"cp.b 200000 FFF80000 80000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"lwe_env=tftp 200000 /tftpboot.dev/lwmon5/env_uboot.bin;" \
"autoscr 200000\0" \
""
diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index 2f0b0a8..6556666 100644
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -155,7 +155,7 @@
#define CFG_RX_ETH_BUFFER 32 /* Number of ethernet rx buffers & descriptors */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index cc2dbcd..a394b4b 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -120,7 +120,7 @@
#define CONFIG_BOOTDELAY 1 /* autoboot after 1 second */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h
index f4a1cc0..98facf2 100644
--- a/include/configs/mgcoge.h
+++ b/include/configs/mgcoge.h
@@ -35,6 +35,9 @@
#define CONFIG_CPM2 1 /* Has a CPM2 */
+/* Do boardspecific init */
+#define CONFIG_BOARD_EARLY_INIT_R 1
+
/*
* Select serial console configuration
*
@@ -152,8 +155,13 @@
#define CFG_FLASH_SIZE 32
#define CFG_FLASH_CFI
#define CFG_FLASH_CFI_DRIVER
-#define CFG_MAX_FLASH_BANKS 1 /* max num of flash banks */
-#define CFG_MAX_FLASH_SECT 256 /* max num of sects on one chip */
+#define CFG_MAX_FLASH_BANKS 2 /* max num of flash banks */
+#define CFG_MAX_FLASH_SECT 512 /* max num of sects on one chip */
+
+#define CFG_FLASH_BASE_1 0x50000000
+#define CFG_FLASH_SIZE_1 64
+
+#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE_1 }
#define CFG_MONITOR_BASE TEXT_BASE
#if (CFG_MONITOR_BASE < CFG_FLASH_BASE)
@@ -246,6 +254,8 @@
* ---- --- ------- ------ ------
* 0 60x GPCM 8 bit FLASH
* 1 60x SDRAM 32 bit SDRAM
+ * 3 60x GPCM 8 bit GPIO/PIGGY
+ * 5 60x GPCM 16 bit CFG-Flash
*
*/
/* Bank 0 - FLASH
@@ -301,6 +311,27 @@
PSDMR_WRC_1C |\
PSDMR_CL_2)
+/* GPIO/PIGGY on CS3 initialization values
+*/
+#define CFG_PIGGY_BASE 0x30000000
+#define CFG_PIGGY_SIZE 128
+
+#define CFG_BR3_PRELIM ((CFG_PIGGY_BASE & BRx_BA_MSK) |\
+ BRx_PS_8 | BRx_MS_GPCM_P | BRx_V)
+
+#define CFG_OR3_PRELIM (MEG_TO_AM(CFG_PIGGY_SIZE) |\
+ ORxG_CSNT | ORxG_ACS_DIV2 |\
+ ORxG_SCY_3_CLK | ORxG_TRLX )
+
+/* CFG-Flash on CS5 initialization values
+*/
+#define CFG_BR5_PRELIM ((CFG_FLASH_BASE_1 & BRx_BA_MSK) |\
+ BRx_PS_16 | BRx_MS_GPCM_P | BRx_V)
+
+#define CFG_OR5_PRELIM (MEG_TO_AM(CFG_FLASH_SIZE_1) |\
+ ORxG_CSNT | ORxG_ACS_DIV2 |\
+ ORxG_SCY_5_CLK | ORxG_TRLX )
+
#define CFG_RESET_ADDRESS 0xFDFFFFFC /* "bad" address */
/* pass open firmware flat tree */
diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 13e7a7c..5482089 100644
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -36,6 +36,9 @@
#define CONFIG_MPC866 1 /* This is a MPC866 CPU */
#define CONFIG_MGSUVD 1 /* ...on a mgsuvd board */
+/* Do boardspecific init */
+#define CONFIG_BOARD_EARLY_INIT_R 1
+
#define CONFIG_8xx_GCLK_FREQ 66000000
#define CFG_SMC_UCODE_PATCH 1 /* Relocate SMC1 */
@@ -51,7 +54,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -299,7 +302,12 @@
* 64 Refresh cycle in ms per number of rows
*/
#define CFG_PTA_PER_CLK ((4096 * 64 * 1000) / (4 * 64))
-/* HS HS noch zu setzen */
+
+/* GPIO/PIGGY on CS3 initialization values
+*/
+#define CFG_PIGGY_BASE (0x30000000)
+#define CFG_OR3_PRELIM (0xfe000d24)
+#define CFG_BR3_PRELIM (0x30000401)
/*
* Internal Definitions
@@ -318,7 +326,7 @@
#define CONFIG_OF_BOARD_SETUP 1
#define OF_CPU "PowerPC,866@0"
-#define OF_SOC "soc@f0000000"
+#define OF_SOC "soc@fff00000"
#define OF_TBCLK (bd->bi_busfreq / 4)
#define OF_STDOUT_PATH "/soc/cpm/serial@a80"
diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index c7216c9..f614e67 100644
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -107,8 +107,7 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK
#undef CONFIG_BOOTARGS
-/* #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\"
- * to mount root filesystem over NFS;echo" */
+/* #define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo" */
#if (CONFIG_BOOTDELAY >= 0)
#define CONFIG_BOOTCOMMAND "tftpboot 0x400000 zImage.initrd.elf;\
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index f1d73e4..f75e194 100644
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -111,7 +111,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index fd4d3af..5a6eb4a 100644
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -169,7 +169,7 @@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -199,7 +199,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index bec442d..45dc343 100644
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -219,7 +219,7 @@
"update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;" \
"cp.b 100000 fff00000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"serverip=11.0.0.152\0"
#if defined (CONFIG_P3M750)
diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 255e072..82f2391 100644
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -118,7 +118,7 @@
* Default configuration (environment varibles...)
*----------------------------------------------------------------------*/
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -147,7 +147,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"unlock=yes\0" \
""
#define CONFIG_BOOTCOMMAND "run net_nfs"
diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index 07fc23e..893924b 100644
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -142,7 +142,7 @@
#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -172,7 +172,7 @@
"load=tftp 100000 /tftpboot/pcs440ep/u-boot.bin\0" \
"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \
"cp.b 100000 FFFA0000 60000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
@@ -182,10 +182,6 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#endif
-#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
- "echo"
-
/* check U-Boot image with SHA1 sum */
#define CONFIG_SHA1_CHECK_UB_IMG 1
#define CONFIG_SHA1_START CFG_MONITOR_BASE
diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 5b5b0ef..ed41b2f 100644
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -140,7 +140,7 @@
* Default configuration (environment varibles...)
*----------------------------------------------------------------------*/
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -170,7 +170,7 @@
"update=protect off 50000000 5007dfff;era 50000000 5007dfff;" \
"cp.b 100000 50000000 ${filesize};" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"ipaddr=10.0.0.233\0" \
"serverip=10.0.0.152\0" \
"netmask=255.255.0.0\0" \
diff --git a/include/configs/purple.h b/include/configs/purple.h
index 6eb618e..1be4e05 100644
--- a/include/configs/purple.h
+++ b/include/configs/purple.h
@@ -48,7 +48,7 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 2498b3e..d00c22f 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -688,7 +688,7 @@
"load=tftp 100000 /tftpboot/sbc8349/u-boot.bin\0" \
"update=protect off fff00000 fff3ffff; " \
"era fff00000 fff3ffff; cp.b 100000 fff00000 ${filesize}\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"fdtaddr=400000\0" \
"fdtfile=sbc8349.dtb\0" \
""
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 0a7a904..516203a 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -168,7 +168,7 @@
#define CFG_OR0_PRELIM 0xff806e65
#define CFG_OR6_PRELIM 0xfc006e65
-#define CFG_FLASH_BANKS_LIST {0xff800000, CFG_FLASH_BASE}
+#define CFG_FLASH_BANKS_LIST {CFG_FLASH_BASE}
#define CFG_MAX_FLASH_BANKS 1 /* number of banks */
#define CFG_MAX_FLASH_SECT 128 /* sectors per device */
#undef CFG_FLASH_CHECKSUM
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 0a03c0e..f6e40de 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -97,7 +97,7 @@
#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 52952a9..dfa8779 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2006-2007
+ * (C) Copyright 2006-2008
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* (C) Copyright 2006
@@ -246,7 +246,7 @@
#define CFG_DTT_HYSTERESIS 3
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -254,11 +254,13 @@
/* Setup some board specific values for the default environment variables */
#ifndef CONFIG_RAINIER
#define CONFIG_HOSTNAME sequoia
-#define CFG_BOOTFILE "bootfile=/tftpboot/sequoia/uImage\0"
+#define CFG_BOOTFILE "bootfile=sequoia/uImage\0"
+#define CFG_DTBFILE "fdt_file=sequoia/sequoia.dtb\0"
#define CFG_ROOTPATH "rootpath=/opt/eldk/ppc_4xxFP\0"
#else
#define CONFIG_HOSTNAME rainier
-#define CFG_BOOTFILE "bootfile=/tftpboot/rainier/uImage\0"
+#define CFG_BOOTFILE "bootfile=rainier/uImage\0"
+#define CFG_DTBFILE "fdt_file=rainier/rainier.dtb\0"
#define CFG_ROOTPATH "rootpath=/opt/eldk/ppc_4xx\0"
#endif
@@ -273,18 +275,26 @@
"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;" \
+ "addmisc=setenv bootargs ${bootargs} mem=${mem}\0" \
+ "flash_nfs=run nfsargs addip addtty addmisc;" \
"bootm ${kernel_addr}\0" \
- "flash_self=run ramargs addip addtty;" \
+ "flash_self=run ramargs addip addtty addmisc;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
- "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \
- "bootm\0" \
+ "net_nfs=tftp 200000 ${bootfile};" \
+ "run nfsargs addip addtty addmisc;" \
+ "bootm\0" \
+ "fdt_file=sequoia/sequoia.dtb\0" \
+ "fdt_addr=400000\0" \
+ "net_nfs_fdt=tftp 200000 ${bootfile};" \
+ "tftp ${fdt_addr} ${fdt_file};" \
+ "run nfsargs addip addtty addmisc;" \
+ "bootm 200000 - ${fdt_addr}\0" \
"kernel_addr=FC000000\0" \
"ramdisk_addr=FC180000\0" \
"load=tftp 200000 /tftpboot/${hostname}/u-boot.bin\0" \
"update=protect off FFFA0000 FFFFFFFF;era FFFA0000 FFFFFFFF;" \
"cp.b 200000 FFFA0000 60000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h
index ad68c75..4578cae 100644
--- a/include/configs/smmaco4.h
+++ b/include/configs/smmaco4.h
@@ -108,7 +108,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index fe014ea..b622a30 100644
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -100,7 +100,7 @@
#define CONFIG_HOSTNAME sorcery
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index 4b618f3..a9ce015 100644
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -183,7 +183,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/taihu.h b/include/configs/taihu.h
index d012c60..7db9736 100644
--- a/include/configs/taihu.h
+++ b/include/configs/taihu.h
@@ -72,7 +72,7 @@
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -99,7 +99,7 @@
"load=tftp 200000 /tftpboot/taihu/u-boot.bin\0" \
"update=protect off FFFC0000 FFFFFFFF;era FFFC0000 FFFFFFFF;" \
"cp.b 200000 FFFC0000 40000\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/taishan.h b/include/configs/taishan.h
index ab3b0c1..851a7ad 100644
--- a/include/configs/taishan.h
+++ b/include/configs/taishan.h
@@ -164,7 +164,7 @@
*----------------------------------------------------------------------*/
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -194,7 +194,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"fixedip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):" \
"$(gatewayip):$(netmask):$(hostname):$(netdev):off panic=1\0" \
"dhcp=setenv bootargs $(bootargs) ip=dhcp\0" \
diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index a21af21..dadf5d3 100644
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -43,10 +43,10 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"boot\" for the network boot using DHCP, TFTP and NFS;" \
- "echo Type \"run netboot_initrd\" for the network boot with initrd;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
- "echo Type \"run flash_local\" to mount local root filesystem;" \
+ "echo Type \\\"boot\\\" for the network boot using DHCP, TFTP and NFS;" \
+ "echo Type \\\"run netboot_initrd\\\" for the network boot with initrd;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_local\\\" to mount local root filesystem;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/uc100.h b/include/configs/uc100.h
index 92148e2..c1c2e03 100644
--- a/include/configs/uc100.h
+++ b/include/configs/uc100.h
@@ -60,7 +60,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/uc101.h b/include/configs/uc101.h
index 81df141..dc1d7e1 100644
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -91,7 +91,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/v37.h b/include/configs/v37.h
index 0407253..47851c2 100644
--- a/include/configs/v37.h
+++ b/include/configs/v37.h
@@ -58,7 +58,7 @@
#endif
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index c0b1a15..e24d6f7 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -128,7 +128,7 @@
#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h
index 827a28f..6bb075d 100644
--- a/include/configs/virtlab2.h
+++ b/include/configs/virtlab2.h
@@ -52,7 +52,7 @@
#define CONFIG_BOARD_TYPES 1 /* support board types */
-#define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
+#define CONFIG_PREBOOT "echo;echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;echo"
#undef CONFIG_BOOTARGS
diff --git a/include/configs/walnut.h b/include/configs/walnut.h
index 19b29e7..f6e99ac 100644
--- a/include/configs/walnut.h
+++ b/include/configs/walnut.h
@@ -43,7 +43,7 @@
#define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -73,7 +73,7 @@
"update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;" \
"cp.b 100000 fffc0000 40000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run net_nfs"
diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h
index 4c86bc5..c9323f6 100644
--- a/include/configs/yosemite.h
+++ b/include/configs/yosemite.h
@@ -169,7 +169,7 @@
#define CFG_DTT_HYSTERESIS 3
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -209,7 +209,7 @@
"update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
"cp.b 200000 fff80000 80000;" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
""
#define CONFIG_BOOTCOMMAND "run flash_self"
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index db1d35b..1e3571e 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -154,7 +154,7 @@
#define CONFIG_ENV_OVERWRITE 1
#define CONFIG_PREBOOT "echo;" \
- "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+ "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
@@ -175,7 +175,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \
"bootm\0" \
- "rootpath=/opt/eldk/ppc_4xx\0" \
+ "rootpath=/opt/eldk/ppc_4xx\0" \
"bootfile=yucca/uImage\0" \
"kernel_addr=E7F10000\0" \
"ramdisk_addr=E7F20000\0" \
@@ -184,7 +184,7 @@
"update=protect off 2:4-7;era 2:4-7;" \
"cp.b ${fileaddr} FFFB0000 ${filesize};" \
"setenv filesize;saveenv\0" \
- "upd=run load;run update\0" \
+ "upd=run load update\0" \
"pciconfighost=1\0" \
"pcie_mode=RP:EP:EP\0" \
""