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

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

diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 7c6a65ac0a64fa2f24354f2f97d0d68cdc7cbdfc..d10f092f98530aa2a48d82ca79488b07decee742 100644 (file)
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -29,8 +29,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -75,7 +73,14 @@
 #define CONFIG_CMD_DHCP
 
 
-#define CONFIG_BOOTP_MASK      CONFIG_BOOTP_DEFAULT
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+
 
 #define CONFIG_BOOTDELAY       3
 #define CONFIG_BOOTARGS                "console=ttySA0,115200n8 root=/dev/nfs ip=bootp"