configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / configs / M54418TWR.h

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index 25b3cdac4228b18a41cc7aef7032f2414cbdaeae..e10c3e19294c7d3c8dee9766af826f7da4464d02 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -38,31 +38,11 @@
 #define CONFIG_BOOTP_HOSTNAME
 
 /* Command line configuration */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_BOOTD
-#define CONFIG_CMD_CACHE
 #undef CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_JFFS2
 #undef CONFIG_CMD_UBI
-#define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_MISC
-#define CONFIG_CMD_MII
 #undef CONFIG_CMD_NAND
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_SF
-#undef CONFIG_CMD_IMLS
-
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
 
 /*
  * NAND FLASH
@@ -79,7 +59,6 @@
 /* Network configuration */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#define CONFIG_NET_MULTI               1
 #define CONFIG_MII                     1
 #define CONFIG_MII_INIT                1
 #define CONFIG_SYS_DISCOVER_PHY
@@ -206,8 +185,6 @@
 #define CONFIG_HARD_SPI
 #define CONFIG_SYS_SBFHDR_SIZE         0x7
 #ifdef CONFIG_CMD_SPI
-#      define CONFIG_SPI_FLASH
-#      define CONFIG_SPI_FLASH_ATMEL
 
 #      define CONFIG_SYS_DSPI_CTAR0    (DSPI_CTAR_TRSZ(7) | \
                                         DSPI_CTAR_PCSSCK_1CLK | \
@@ -225,11 +202,6 @@
 
 #define CONFIG_PRAM                    2048    /* 2048 KB */
 
-/* HUSH */
-#define CONFIG_SYS_HUSH_PARSER         1
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-
-#define CONFIG_SYS_PROMPT              "-> "
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 
 #if defined(CONFIG_CMD_KGDB)
@@ -283,7 +255,7 @@
 #endif
 
 #if defined(CONFIG_SERIAL_BOOT)
-#define CONFIG_SYS_MONITOR_BASE        (TEXT_BASE + 0x400)
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_TEXT_BASE + 0x400)
 #else
 #define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_FLASH_BASE + 0x400)
 #endif