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

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

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 71eb81c2f726792ae4a61513d57ee144462c430d..9947dc05f14a0b08d23da16fe6b9774b0012b485 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -23,7 +23,6 @@
 
 #define CONFIG_SYS_TEXT_BASE   0x0
 
-#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 
@@ -75,13 +74,10 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BSP
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_NAND
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
@@ -108,7 +104,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_SYS_PROMPT      "SMDK2410 # "
 #define CONFIG_SYS_CBSIZE      256
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + \