summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-07-27 16:57:34 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-07-27 16:57:34 +0200
commitfc6c4a67ae94adac02da6257a0f5adc3bd48ebec (patch)
treed5137f398fd678d552e47703f28c11302f75d1ad /include
parent4c4aca8166257e9db13670f87fa9cd077bfd9ef5 (diff)
parent193dd958344f9c27ed026d2e3db2a1a0a9eb5631 (diff)
downloadu-boot-imx-fc6c4a67ae94adac02da6257a0f5adc3bd48ebec.zip
u-boot-imx-fc6c4a67ae94adac02da6257a0f5adc3bd48ebec.tar.gz
u-boot-imx-fc6c4a67ae94adac02da6257a0f5adc3bd48ebec.tar.bz2
Merge with /home/sr/git/u-boot/denx
Diffstat (limited to 'include')
-rw-r--r--include/configs/bamboo.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h
index 6d32821..2c1c319 100644
--- a/include/configs/bamboo.h
+++ b/include/configs/bamboo.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2005
+ * (C) Copyright 2005-2006
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -49,7 +49,7 @@
* Base addresses -- Note these are effective addresses where the
* actual resources get mapped (not physical addresses)
*----------------------------------------------------------------------*/
-#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */
+#define CFG_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Monitor */
#define CFG_MALLOC_LEN (256 * 1024) /* Reserve 256 kB for malloc() */
#define CFG_MONITOR_BASE (-CFG_MONITOR_LEN)
#define CFG_SDRAM_BASE 0x00000000 /* _must_ be 0 */
@@ -257,8 +257,8 @@
"kernel_addr=fff00000\0" \
"ramdisk_addr=fff10000\0" \
"load=tftp 100000 /tftpboot/bamboo/u-boot.bin\0" \
- "update=protect off fff80000 ffffffff;era fff80000 ffffffff;" \
- "cp.b 100000 fff80000 80000;" \
+ "update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;" \
+ "cp.b 100000 fffa0000 60000;" \
"setenv filesize;saveenv\0" \
"upd=run load;run update\0" \
""
@@ -358,6 +358,14 @@
#define CFG_HZ 1000 /* decrementer freq: 1 ms ticks */
+#define CONFIG_CMDLINE_EDITING
+
+#ifdef CONFIG_CMDLINE_EDITING
+#undef CONFIG_AUTO_COMPLETE
+#else
+#define CONFIG_AUTO_COMPLETE
+#endif
+
/*-----------------------------------------------------------------------
* PCI stuff
*-----------------------------------------------------------------------