Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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);
 }

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:
 
 	+------+	+------+
 	|      |	| **** |

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:
 
 	+------+	+------+
 	|      |	| **** |

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

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

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
 

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 */

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
 

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 */

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 */

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 */

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 */

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 */

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
 

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 */