Merge branch 'master' of /home/stefan/git/u-boot/u-boot

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

diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index 8b841ff546f6ac39ba6e904b3060ec71929b2536..e9704fc9af813d39514cac798f9d3d3203ae4464 100644 (file)
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -34,7 +34,7 @@
 #define CONFIG_ARM7            1       /* This is a ARM7 CPU   */
 #define CONFIG_IMPA7           1       /* on an impA7 Board      */
 #define CONFIG_ARM_THUMB       1       /* this is an ARM720TDMI */
-#define CONFIG_ARM7_REVD       1       /* enable ARM720 REV.D Workarounds */
+#define CONFIG_ARM7_REVD       1       /* enable ARM720 REV.D Workarounds */
 
 #undef CONFIG_USE_IRQ                  /* don't need them anymore */
 
@@ -61,15 +61,26 @@
 
 #define CONFIG_BAUDRATE                9600
 
-#define CONFIG_BOOTP_MASK       (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | CFG_CMD_JFFS2)
+#define CONFIG_CMD_JFFS2
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
 
 #define CONFIG_BOOTDELAY       3
-#define CONFIG_BOOTARGS        "devfs=mount root=ramfs console=ttyS0,9600"
+#define CONFIG_BOOTARGS                "devfs=mount root=ramfs console=ttyS0,9600"
 /*#define CONFIG_ETHADDR       08:00:3e:26:0a:5a       */
 /*#define CONFIG_NETMASK        255.255.0.0    */
 /*#define CONFIG_IPADDR                172.22.2.128    */
@@ -77,7 +88,7 @@
 /*#define CONFIG_BOOTFILE      "impa7" */
 #define CONFIG_BOOTCOMMAND     "bootp;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