Merge branch 'socrates' of /home/wd/git/u-boot/projects

[karo-tx-uboot.git] / include / configs / shannon.h

diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index cad38d0c00d179ae2cd4c61c3209224079e78d44..8bbc730cb9cccbe0e782587637f54816cbe4e013 100644 (file)
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.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_NETMASK          255.255.0.0
 #define CONFIG_BOOTCOMMAND     "help"