Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / include / configs / ixdpg425.h

diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index 6c103ce6f321e78edf1bb9612ea19671382c6f22..a3be0b51e60b91b08586960c7d51e76e1080ad27 100644 (file)
--- a/include/configs/ixdpg425.h
+++ b/include/configs/ixdpg425.h
@@ -76,6 +76,15 @@
 #define CFG_IXP425_CONSOLE     IXP425_UART1   /* we use UART1 for console */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -130,7 +139,7 @@
  * Default configuration (environment varibles...)
  *----------------------------------------------------------------------*/
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -159,7 +168,7 @@
        "update=protect off 50000000 5003ffff;era 50000000 5003ffff;"   \
                "cp.b 100000 50000000 40000;"                           \
                "setenv filesize;saveenv\0"                             \
-       "upd=run load;run update\0"                                     \
+       "upd=run load update\0"                                         \
        ""
 #define CONFIG_BOOTCOMMAND     "run net_nfs"