Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index cfb3e7affd845c3232164ce20c516cfc8a86009e..2b902310f5c3ebfba124eec0ce727771f1aee0d8 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -33,13 +33,10 @@
 #define CONFIG_MALLOC_F_ADDR           0x0010000
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)      /* 32MB  */
 
-#define CONFIG_SYS_LONGHELP                    /* #undef to save memory */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /* turn on command-line edit/c/auto */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 
 #define CONFIG_ENV_SIZE                8192
 
@@ -58,16 +55,12 @@
 /* Size of our emulated memory */
 #define CONFIG_SYS_SDRAM_BASE          0
 #define CONFIG_SYS_SDRAM_SIZE          (128 << 20)
-#define CONFIG_SYS_TEXT_BASE           0
 #define CONFIG_SYS_MONITOR_BASE        0
 #define CONFIG_NR_DRAM_BANKS           1
 
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-/* include default commands */
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(HOST, host, 1) \
        func(HOST, host, 0)
@@ -77,7 +70,6 @@
 #define CONFIG_KEEP_SERVERADDR
 #define CONFIG_UDP_CHECKSUM
 #define CONFIG_TIMESTAMP
-#define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_SERVERIP
@@ -146,10 +138,6 @@
 
 #define CONFIG_SYS_SATA_MAX_DEVICE     2
 
-#define CONFIG_SYSTEMACE
-#define CONFIG_SYS_SYSTEMACE_WIDTH     16
-#define CONFIG_SYS_SYSTEMACE_BASE      0
-
 #define CONFIG_MISC_INIT_F
 
 #endif