aboutsummaryrefslogtreecommitdiffstats
path: root/include/configs/Adder.h
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
committerStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
commitf2302d4430e7f3f48308d6a585320fe96af8afbd (patch)
treeeec529fa883a32b0bd44f65aa46a454dc5c69688 /include/configs/Adder.h
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
downloadu-boot-midas-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz
u-boot-midas-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.bz2
u-boot-midas-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/configs/Adder.h')
-rw-r--r--include/configs/Adder.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/Adder.h b/include/configs/Adder.h
index 7389c38b9e..cefdd29602 100644
--- a/include/configs/Adder.h
+++ b/include/configs/Adder.h
@@ -131,7 +131,7 @@
#define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */
#define CFG_MONITOR_BASE TEXT_BASE
-#define CFG_MONITOR_LEN (192 << 10) /* Reserve 192 KB for Monitor */
+#define CFG_MONITOR_LEN (256 << 10) /* Reserve 256 KB for Monitor */
#ifdef CONFIG_BZIP2
#define CFG_MALLOC_LEN (2500 << 10) /* Reserve ~2.5 MB for malloc() */
#else