summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-09 21:48:26 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-09 21:48:26 -0500
commit2fd90ce575b02d189cbf443c85309bcd001aa393 (patch)
tree69d87b0c787bcced0029b130a36767e6a04b4012
parent37d4bb70586659dedef1658ce1bed071be098aec (diff)
include/configs/[a-m]*: Directly use CONFIG_BOOTP_* symbols rather than CONFIG_BOOTP_MASK.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat
-rw-r--r--include/configs/armadillo.h9
-rw-r--r--include/configs/assabet.h9
-rw-r--r--include/configs/atc.h10
-rw-r--r--include/configs/atstk1002.h8
-rw-r--r--include/configs/barco.h16
-rw-r--r--include/configs/c2mon.h10
-rw-r--r--include/configs/csb272.h12
-rw-r--r--include/configs/csb472.h13
-rw-r--r--include/configs/ep7312.h9
-rw-r--r--include/configs/evb4510.h9
-rw-r--r--include/configs/gcplus.h9
-rw-r--r--include/configs/gw8260.h15
-rw-r--r--include/configs/hermes.h9
-rw-r--r--include/configs/impa7.h9
-rw-r--r--include/configs/integratorap.h1
-rw-r--r--include/configs/integratorcp.h2
-rw-r--r--include/configs/kvme080.h10
-rw-r--r--include/configs/lpc2292sodimm.h9
-rw-r--r--include/configs/lwmon.h9
-rw-r--r--include/configs/modnet50.h9
20 files changed, 147 insertions, 40 deletions
diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 7c77fa73115..73a88854b38 100644
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -71,7 +71,14 @@
#define CONFIG_BAUDRATE 115200
-#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
/*
diff --git a/include/configs/assabet.h b/include/configs/assabet.h
index 7c6a65ac0a6..226ad54723e 100644
--- a/include/configs/assabet.h
+++ b/include/configs/assabet.h
@@ -75,7 +75,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"
diff --git a/include/configs/atc.h b/include/configs/atc.h
index 4f527fa40d5..3ff4b68083a 100644
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -122,7 +122,15 @@
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */
-#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
/*
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index de2fd31af25..e1d8f74c5ec 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -108,8 +108,12 @@
#define CONFIG_OVERWRITE_ETHADDR_ONCE 1
#define CONFIG_NET_MULTI 1
-#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_SUBNETMASK \
- | CONFIG_BOOTP_GATEWAY)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+
/*
* Command line configuration.
diff --git a/include/configs/barco.h b/include/configs/barco.h
index 225ab8d0e14..09078d42c62 100644
--- a/include/configs/barco.h
+++ b/include/configs/barco.h
@@ -70,13 +70,17 @@
#define CONFIG_BOOTARGS "mem=32M"
-/* Add support for a few extra bootp options like:
- * - File size
- * - DNS
+
+/*
+ * BOOTP options
*/
-#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \
- CONFIG_BOOTP_BOOTFILESIZE | \
- CONFIG_BOOTP_DNS)
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS
+
/*
* Command line configuration.
diff --git a/include/configs/c2mon.h b/include/configs/c2mon.h
index 946b179f152..a9a52547756 100644
--- a/include/configs/c2mon.h
+++ b/include/configs/c2mon.h
@@ -68,7 +68,15 @@
#undef CONFIG_CAN_DRIVER /* CAN Driver support disabled */
-#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
+
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 63ea24edea0..c43b49737d9 100644
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -73,12 +73,14 @@
#endif
/*
- * BOOTP/DHCP protocol configuration
- *
+ * BOOTP options
*/
-#define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \
- CONFIG_BOOTP_DNS2 | \
- CONFIG_BOOTP_BOOTFILESIZE )
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS2
/*
diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 316b1fee21d..a7120aa57f9 100644
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -73,12 +73,15 @@
#endif
/*
- * BOOTP/DHCP protocol configuration
- *
+ * BOOTP options
*/
-#define CONFIG_BOOTP_MASK ( CONFIG_BOOTP_DEFAULT | \
- CONFIG_BOOTP_DNS2 | \
- CONFIG_BOOTP_BOOTFILESIZE )
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS2
+
/*
* Command line configuration.
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 12be15102f5..f5cf477a313 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -62,7 +62,14 @@
#define CONFIG_BAUDRATE 9600
-#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
/*
diff --git a/include/configs/evb4510.h b/include/configs/evb4510.h
index 0a4aeb95ade..66500c21e02 100644
--- a/include/configs/evb4510.h
+++ b/include/configs/evb4510.h
@@ -72,7 +72,14 @@
#define CONFIG_BAUDRATE 19200
-#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
/*
diff --git a/include/configs/gcplus.h b/include/configs/gcplus.h
index 0aecb38e440..e11ce4c715e 100644
--- a/include/configs/gcplus.h
+++ b/include/configs/gcplus.h
@@ -88,7 +88,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,38400n8 mtdparts=sa1100-flash:1m@0(zImage),3m@1m(ramdisk.gz),12m@4m(userfs) root=/dev/nfs ip=bootp"
diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index a8bc928b63b..79e6aa1ba6c 100644
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -285,13 +285,16 @@
#undef CONFIG_AUTOBOOT_DELAY_STR
#define DEBUG_BOOTKEYS 0
-/* Add support for a few extra bootp options like:
- * - File size
- * - DNS
+/*
+ * BOOTP options
*/
-#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT | \
- CONFIG_BOOTP_BOOTFILESIZE | \
- CONFIG_BOOTP_DNS)
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+
+#define CONFIG_BOOTP_BOOTFILESIZE
+#definef CONFIG_BOOTP_DNS
/* undef this to save memory */
#define CFG_LONGHELP
diff --git a/include/configs/hermes.h b/include/configs/hermes.h
index f1cc8d263f8..e3a2ed28034 100644
--- a/include/configs/hermes.h
+++ b/include/configs/hermes.h
@@ -71,7 +71,14 @@
#include <config_cmd_default.h>
-#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
+
/*
* Miscellaneous configurable options
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index 6570815696e..0e52ffe0a29 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -61,7 +61,14 @@
#define CONFIG_BAUDRATE 9600
-#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
/*
diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 3594f4ffd23..be3b1140bb1 100644
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -67,7 +67,6 @@
#define CFG_SERIAL1 0x17000000
/*#define CONFIG_NET_MULTI */
-/*#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT */
/*
diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index a5174293452..191c5e61e32 100644
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -84,8 +84,6 @@
#define CONFIG_CMD_PING
-/* #define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT */
-
#if 0
#define CONFIG_BOOTDELAY 2
#define CONFIG_BOOTARGS "root=/dev/nfs nfsroot=<IP address>:/<exported rootfs> mem=128M ip=dhcp netdev=27,0,0xfc800000,0xfc800010,eth0 video=clcdfb:0"
diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 53d6af28cc6..569800aa231 100644
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -60,7 +60,15 @@
#undef CONFIG_WATCHDOG
-#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
+
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
diff --git a/include/configs/lpc2292sodimm.h b/include/configs/lpc2292sodimm.h
index bddfa528a35..e3fef5e2ce9 100644
--- a/include/configs/lpc2292sodimm.h
+++ b/include/configs/lpc2292sodimm.h
@@ -66,7 +66,14 @@
#define CONFIG_BAUDRATE 115200
-#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
/*
diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 1db5e90965d..8a8270260a3 100644
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -196,7 +196,14 @@
#define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION
-#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
/*
diff --git a/include/configs/modnet50.h b/include/configs/modnet50.h
index 33ae43efe88..4461bdfd187 100644
--- a/include/configs/modnet50.h
+++ b/include/configs/modnet50.h
@@ -63,7 +63,14 @@
#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
/*
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-16 01:07:58 +0000