summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-04-27 23:41:01 +0200
committerWolfgang Denk <wd@denx.de>2009-04-27 23:41:01 +0200
commit9c48a8ea383098a5b217aba91b6d44cefd5cbeeb (patch)
treee2e97524c56def3f44802a578e9e567d5edfa131
parent34b76a14f676bc6501c27a96564e4dfb4793f033 (diff)
parent14b9308d511b53042ef478936e367a67282df66a (diff)
downloadu-boot-imx-9c48a8ea383098a5b217aba91b6d44cefd5cbeeb.zip
u-boot-imx-9c48a8ea383098a5b217aba91b6d44cefd5cbeeb.tar.gz
u-boot-imx-9c48a8ea383098a5b217aba91b6d44cefd5cbeeb.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
-rw-r--r--cpu/mpc83xx/fdt.c4
-rw-r--r--include/configs/MPC8360ERDK.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mpc83xx/fdt.c b/cpu/mpc83xx/fdt.c
index 4cc9047..13443cb 100644
--- a/cpu/mpc83xx/fdt.c
+++ b/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
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index f7ebdaa..477a1c5 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/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 */