summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-26 00:07:26 +0200
committerWolfgang Denk <wd@denx.de>2008-04-26 00:07:26 +0200
commit57533b881ed55eb676c56f458c1a1e84b79cd4ee (patch)
tree7cae853acd2ca5a5838d43451683633c94d57613
parentfe06d43b504af9ebc6c9bfe511853de6e42f257e (diff)
parentb2115757403beef0ac6bc2c6c3b24f31256a75d2 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat
-rw-r--r--cpu/mpc83xx/fdt.c8
-rw-r--r--doc/README.mpc8313erdb4
-rw-r--r--doc/README.mpc8315erdb2
-rw-r--r--doc/README.mpc837xemds2
-rw-r--r--doc/README.mpc837xerdb13
-rw-r--r--include/configs/MPC8313ERDB.h2
-rw-r--r--include/configs/MPC8315ERDB.h2
-rw-r--r--include/configs/MPC8323ERDB.h2
-rw-r--r--include/configs/MPC832XEMDS.h2
-rw-r--r--include/configs/MPC8349EMDS.h2
-rw-r--r--include/configs/MPC8349ITX.h2
-rw-r--r--include/configs/MPC8360EMDS.h2
-rw-r--r--include/configs/MPC837XEMDS.h2
-rw-r--r--include/configs/MPC837XERDB.h2
-rw-r--r--include/configs/sbc8349.h2
15 files changed, 20 insertions, 29 deletions
diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c
index b39f678f1a..02c4d0529c 100644
--- a/cpu/mpc83xx/fdt.c
+++ b/cpu/mpc83xx/fdt.c
@@ -63,13 +63,5 @@ void ft_cpu_setup(void *blob, bd_t *bd)
"clock-frequency", bd->bi_busfreq, 1);
#endif
-#ifdef CONFIG_CPM2
- do_fixup_by_compat_u32(blob, "fsl,cpm2-scc-uart",
- "current-speed", bd->bi_baudrate, 1);
-
- do_fixup_by_compat_u32(blob, "fsl,cpm2-brg",
- "clock-frequency", bd->bi_brgfreq, 1);
-#endif
-
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
}
diff --git a/doc/README.mpc8313erdb b/doc/README.mpc8313erdb
index 7ad4cc76c3..21580f9496 100644
--- a/doc/README.mpc8313erdb
+++ b/doc/README.mpc8313erdb
@@ -3,10 +3,10 @@ Freescale MPC8313ERDB Board
1. Board Switches and Jumpers
- SW3 is used to set CFG_RESET_SOURCE.
+ S3 is used to set CFG_RESET_SOURCE.
To boot the image at 0xFE000000 in NOR flash, use these DIP
- switche settings for SW3 SW4:
+ switch settings for S3 S4:
+------+ +------+
| | | **** |
diff --git a/doc/README.mpc8315erdb b/doc/README.mpc8315erdb
index c630cf88b3..e77eba710e 100644
--- a/doc/README.mpc8315erdb
+++ b/doc/README.mpc8315erdb
@@ -6,7 +6,7 @@ Freescale MPC8315ERDB Board
S3 is used to set CFG_RESET_SOURCE.
To boot the image at 0xFE000000 in NOR flash, use these DIP
- switche settings for S3 S4:
+ switch settings for S3 S4:
+------+ +------+
| | | **** |
diff --git a/doc/README.mpc837xemds b/doc/README.mpc837xemds
index 3f0cdf7db8..78235952eb 100644
--- a/doc/README.mpc837xemds
+++ b/doc/README.mpc837xemds
@@ -49,7 +49,7 @@ Freescale MPC837xEMDS Board
0xe010_0000 0xe02f_ffff Empty 2M
0xe030_0000 0xe03f_ffff PCI IO 1M
0xe040_0000 0xe05f_ffff Empty 2M
- 0xe060_0000 0xe060_8000 NAND Flash 32K
+ 0xe060_0000 0xe060_7fff NAND Flash 32K
0xf400_0000 0xf7ff_ffff Empty 64M
0xf800_0000 0xf800_7fff BCSR on CS1 32K
0xfe00_0000 0xffff_ffff NOR Flash on CS0 32M
diff --git a/doc/README.mpc837xerdb b/doc/README.mpc837xerdb
index 8f0192aab1..510e3bb9b1 100644
--- a/doc/README.mpc837xerdb
+++ b/doc/README.mpc837xerdb
@@ -1,4 +1,4 @@
-Freescale MPC837xEMDS Board
+Freescale MPC837xE-RDB Board
-----------------------------------------
1. Board Description
@@ -38,12 +38,11 @@ Freescale MPC837xEMDS Board
=========================== ================= ======= =========
0x0000_0000 0x0fff_ffff DDR 256M 64
0x1000_0000 0x7fff_ffff Empty 1.75G -
- 0x8000_0000 0x9fff_ffff PCI1 memory space 512M 32
- 0xa000_0000 0xbfff_ffff PCI2 memory space 512M 32
- 0xc200_0000 0xc2ff_ffff PCI1 I/O space 16M 32
- 0xc300_0000 0xc3ff_ffff PCI2 I/O space 16M 32
+ 0x8000_0000 0x8fff_ffff PCI MEM prefetch 256M 32
+ 0x9000_0000 0x9fff_ffff PCI MEM non-prefetch 256M 32
+ 0xe030_0000 0xe03f_ffff PCI I/O space 1M 32
0xe000_0000 0xe00f_ffff Int Mem Reg Space 1M -
- 0xe280_0000 0xe47f_ffff NAND Flash 32M 8
+ 0xe060_0000 0xe060_7fff NAND Flash 32K 8
0xfe00_0000 0xfe7f_ffff NOR Flash on CS0 8M 16
@@ -55,7 +54,7 @@ Freescale MPC837xEMDS Board
CONFIG_MPC83XX MPC83xx family for both MPC8349 and MPC8360
CONFIG_MPC837X MPC837x specific
- CONFIG_MPC837XERDB MPC837XEMDS board specific
+ CONFIG_MPC837XERDB MPC837xE-RDB board specific
4. Compilation
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 9576fa59e2..6eec240e9f 100644
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -543,7 +543,7 @@
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc8313erdb.dtb
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index 432fb311de..e0a887c7e6 100644
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -531,7 +531,7 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 92d7aa42b4..32f57ac7da 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -568,7 +568,7 @@
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc832x_rdb.dtb
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index be2ab45584..ddefa5e919 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -572,7 +572,7 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 07fefecf74..364ffac5ea 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -709,7 +709,7 @@
#define CONFIG_GATEWAYIP 192.168.1.1
#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index 6b8b74dd96..be8850a7e7 100644
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -474,7 +474,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#define CFG_PROMPT_HUSH_PS2 "> "
#define CFG_LOAD_ADDR 0x2000000 /* default load address */
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#ifdef CONFIG_MPC8349ITX
#define CFG_PROMPT "MPC8349E-mITX> " /* Monitor Command Prompt */
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 46451c4c98..983575eb0c 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -605,7 +605,7 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index 7fc0f7ef85..e92493ae4d 100644
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -595,7 +595,7 @@
#define CONFIG_BAUDRATE 115200
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index c698ff84c6..f7e6fd2c52 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -629,7 +629,7 @@
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc8379_rdb.dtb
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index 133cbcf171..0ebc674a69 100644
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -662,7 +662,7 @@
#define CONFIG_GATEWAYIP 192.168.1.1
#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */
+#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */
#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-25 05:39:03 +0000