Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 80f7a1e8ec0c883d92d05ee9c3036532146b9ca1..1b61afd324a7042d35c7ed9ac2153ea122329869 100644 (file)
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -18,7 +18,6 @@
  */
 #define MACH_TYPE_DNS325               3800
 #define CONFIG_MACH_TYPE               MACH_TYPE_DNS325
-#define CONFIG_IDENT_STRING            "\nD-Link DNS-325"
 
 /*
  * High Level Configuration Options (easy to change)
@@ -31,11 +30,8 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_DATE
 #define CONFIG_SYS_MVFS
@@ -49,7 +45,6 @@
 #include "mv-common.h"
 
 /* Remove or override few declarations from mv-common.h */
-#undef CONFIG_SYS_PROMPT
 
 /*
  * Ethernet Driver configuration
@@ -79,22 +74,6 @@
  */
 #define CONFIG_KIRKWOOD_GPIO
 
-/*
- * Use the HUSH parser
- */
-#define CONFIG_SYS_HUSH_PARSER
-
-/*
- * Console configuration
- */
-#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-/*
- * Display cpu info at boot
- */
-#define CONFIG_DISPLAY_CPUINFO
-
 /*
  * Environment variables configurations
  */