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 d4ae19f96cec077c4c92e176cbd8eeafc07ffe39..9947dc05f14a0b08d23da16fe6b9774b0012b485 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -17,13 +17,13 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARM920T         /* This is an ARM920T Core */
-#define CONFIG_S3C24X0         /* in a SAMSUNG S3C24x0-type SoC */
+#define CONFIG_S3C24X0         /* This is a SAMSUNG S3C24x0-type SoC */
 #define CONFIG_S3C2410         /* specifically a SAMSUNG S3C2410 SoC */
 #define CONFIG_SMDK2410                /* on a SAMSUNG SMDK2410 Board */
 
 #define CONFIG_SYS_TEXT_BASE   0x0
 
+
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 
 /* input clock of PLL (the SMDK2410 has 12MHz input clock) */
@@ -74,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
@@ -107,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 + \