Merge branch 'next'

[u-boot] / include / configs / dbau1x00.h

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0abab78d2a95bd393cf048ce15bfa42656f77bb9..817676f182209879b800f11793a1f4254b7b11bf 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -75,7 +75,6 @@
  * Command line configuration.
  */
 #undef CONFIG_CMD_BEDBUG
-#undef CONFIG_CMD_ELF
 #undef CONFIG_CMD_FAT
 #undef CONFIG_CMD_MII
 
@@ -98,8 +97,6 @@
  */
 #define        CONFIG_SYS_LONGHELP                             /* undef to save memory      */
 
-#define        CONFIG_SYS_PROMPT               "DbAu1xx0 # "   /* Monitor Command Prompt    */
-
 #define        CONFIG_SYS_CBSIZE               256             /* Console I/O Buffer Size   */
 #define        CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define        CONFIG_SYS_MAXARGS              16              /* max number of command args*/
@@ -150,6 +147,11 @@
 #define CONFIG_FLASH_CFI_DRIVER    1
 
 /* The following #defines are needed to get flash environment right */
+/* ROM version */
+#define CONFIG_SYS_TEXT_BASE           0xbfc00000
+/* RAM version */
+/* #define CONFIG_SYS_TEXT_BASE                0x80100000 */
+
 #define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)