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

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

diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index e58a2f219c8fb2c1680b45506a83ad2d057d0e82..e7873e95fdd6b030c6a7f1e09fcadfaeabd4ced0 100644 (file)
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -67,6 +67,15 @@
 #define CONFIG_BAUDRATE                115200
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -74,7 +83,7 @@
 
 
 #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