Remove fake flash bank from 8544 DS

[oweals/u-boot.git] / include / configs / dnp1110.h

diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 9ac2856f65317e1c48de73fc9ad730fb5c348f1d..e7873e95fdd6b030c6a7f1e09fcadfaeabd4ced0 100644 (file)
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -66,13 +66,24 @@
 
 #define CONFIG_BAUDRATE                115200
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL)
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
 
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS        "root=ramfs devfs=mount console=ttySA0,115200"
+#define CONFIG_BOOTARGS                "root=ramfs devfs=mount console=ttySA0,115200"
 #define CONFIG_ETHADDR         02:80:ad:20:31:b8
 #define CONFIG_NETMASK          255.255.0.0
 #define CONFIG_IPADDR          172.22.2.23
@@ -80,7 +91,7 @@
 #define CONFIG_BOOTFILE                "dnp1110"
 #define CONFIG_BOOTCOMMAND     "tftp; bootm"
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400          /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2               /* which serial port to use */
 #endif