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

cpu/mpc83xx/fdt.c

@@ -41,8 +41,8 @@ void fdt_fixup_muram (void *blob)
 
 	data[0] = 0;
 	data[1] = QE_MURAM_SIZE - 2 * sizeof(unsigned long);
-	do_fixup_by_path(blob, "/qe/muram/data-only", "reg",
-		      data, sizeof (data), 0);
+	do_fixup_by_compat(blob, "fsl,qe-muram-data", "reg",
+			data, sizeof (data), 0);
 }
 #endif
 

include/configs/MPC8360ERDK.h

@@ -162,7 +162,7 @@
 #undef	CONFIG_SYS_RAMBOOT
 #endif
 
-#define CONFIG_SYS_MONITOR_LEN		(256 * 1024) /* Reserve 256 kB for Mon */
+#define CONFIG_SYS_MONITOR_LEN		(384 * 1024) /* Reserve 384 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024) /* Reserved for malloc */
 
 /*
@@ -339,7 +339,7 @@
 
 #ifndef CONFIG_SYS_RAMBOOT
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE + 0x40000)
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_ENV_SECT_SIZE	0x20000 /* 128K(one sector) for env */
 #define CONFIG_ENV_SIZE		0x20000
 #else /* CONFIG_SYS_RAMBOOT */