Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 20287674faba014da69514eb3879144dccd77b9c..5159897db382a1f97225262ad4f6dd61cb6e6e12 100644 (file)
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -63,12 +63,23 @@
 
 #define CONFIG_BAUDRATE                38400
 
-#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_NETMASK          255.255.255.0
 #define CONFIG_IPADDR          192.168.30.2
@@ -79,9 +90,10 @@
 /*#define CONFIG_BOOTDELAY     10*/
 /* args and cmd for uClinux-image @ 0x10020000, ramdisk-image @ 0x100a0000 */
 #define CONFIG_BOOTCOMMAND     "bootm 0x10020000 0x100a0000"
-#define CONFIG_BOOTARGS        "console=ttyS0,38400 initrd=0x100a0040,530K root=/dev/ram keepinitrd"
+#define CONFIG_BOOTARGS                "console=ttyS0,38400 initrd=0x100a0040,530K " \
+                                       "root=/dev/ram keepinitrd"
 
-#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