diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index 0247b7d25c0..c2a50c1f473 100644
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -72,6 +72,15 @@
 #define CONFIG_BOOTCOMMAND	"ide reset;disk 0x81000000 0:2;run addmisc;bootm"
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h
index 7e1897a7593..6c15b4e14c0 100644
--- a/include/configs/hmi1001.h
+++ b/include/configs/hmi1001.h
@@ -51,6 +51,15 @@
 #define CONFIG_DOS_PARTITION
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -242,8 +251,7 @@
 #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
 
 /*
- * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
- * which is normally part of the default commands (CFV_CMD_DFL)
+ * Enable loopw command.
  */
 #define CONFIG_LOOPW
 
diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index 8a3ad6861e4..b789067f81d 100644
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -173,6 +173,15 @@
 
 #define CONFIG_LAST_STAGE_INIT
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 99266334636..1ab7b27a5d8 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -79,6 +79,15 @@
 	""
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index ef8f7249574..4caf54efd31 100644
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -82,6 +82,15 @@
 #define CONFIG_BOOTCOMMAND	"run flash_self"
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 19f2f194f6a..0fac28fadd7 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -72,6 +72,15 @@
 #define CONFIG_ISO_PARTITION
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -259,8 +268,7 @@
 #define CFG_HZ			1000	/* decrementer freq: 1 ms ticks */
 
 /*
- * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
- * which is normally part of the default commands (CFV_CMD_DFL)
+ * Enable loopw command.
  */
 #define CONFIG_LOOPW
 
diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 38ccf89cd1e..5310e0d428f 100644
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -55,6 +55,15 @@
 #define CONFIG_MISC_INIT_R	1	/* we have a misc_init_r() function */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/ixdp425.h b/include/configs/ixdp425.h
index 8c1ab242f3c..bc5f9e19bdc 100644
--- a/include/configs/ixdp425.h
+++ b/include/configs/ixdp425.h
@@ -54,6 +54,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.
  */
diff --git a/include/configs/ixdpg425.h b/include/configs/ixdpg425.h
index 6c103ce6f32..da59230bb65 100644
--- 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.
  */
diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index e53b848c34a..b68c5aa46e5 100644
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -66,7 +66,6 @@
 #define CONFIG_PCI_IO_BUS	0x50000000
 #define CONFIG_PCI_IO_PHYS	CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE	0x01000000
-#define ADD_PCI_CMD 		CFG_CMD_PCI
 #endif
 
 #define CFG_XLB_PIPELINING	1
@@ -83,6 +82,15 @@
 #define	CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -91,6 +99,10 @@
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_SNTP
 
+#if defined(CONFIG_PCI)
+#define CODFIG_CMD_PCI
+#endif
+
 
 /*
  * Autobooting
diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 4741ead8155..75d9c3b3b46 100644
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -79,6 +79,15 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/lart.h b/include/configs/lart.h
index 98bc3b257b8..8f18c9f1b1b 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -60,6 +60,15 @@
 #define CONFIG_BAUDRATE		9600
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/logodl.h b/include/configs/logodl.h
index 7c11eeb7071..2b2d37751e0 100644
--- a/include/configs/logodl.h
+++ b/include/configs/logodl.h
@@ -55,6 +55,15 @@
 #undef CONFIG_MISC_INIT_R		/* FIXME: misc_init_r() missing     */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index 414cb14da8b..04148898eac 100644
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -56,6 +56,15 @@
 #define	CONFIG_TIMESTAMP	1	/* Print timestamp info for images */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index 87815cb170f..11ede968180 100644
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -56,6 +56,15 @@
 #define	CONFIG_TIMESTAMP	1	/* Print timestamp info for images */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/luan.h b/include/configs/luan.h
index 82af2fb0759..72aae09d039 100644
--- a/include/configs/luan.h
+++ b/include/configs/luan.h
@@ -214,6 +214,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index eed589066e0..4adf2542219 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -68,6 +68,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.
  */
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index 10e25f02290..744f551c3e8 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -92,6 +92,15 @@
 #define CONFIG_AUTO_UPDATE 1
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 6f0d4973f00..49919fbafbb 100644
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -87,6 +87,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/ml300.h b/include/configs/ml300.h
index 423c6ebbb77..0183041842a 100644
--- a/include/configs/ml300.h
+++ b/include/configs/ml300.h
@@ -88,6 +88,15 @@
 #define CFG_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 3a6224012a2..8d6f2613c17 100644
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -129,6 +129,15 @@
 #endif
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 0ae2780f202..5125b21e04f 100644
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -79,6 +79,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.
  */
diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index 47ca0f1eee2..d527d098f57 100644
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -35,6 +35,15 @@
 #undef	CONFIG_SILENT_CONSOLE  /* use this to disable output */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -159,7 +168,7 @@
  * Right now there is no gain for user, but later on booting kernel might be
  * possible. Consider using XIP kernel running from flash to save RAM
  * footprint.
- * NOTE: Enable CFG_CMD_JFFS2 for JFFS2 support.
+ * NOTE: Enable CONFIG_CMD_JFFS2 for JFFS2 support.
  */
 
 /*
diff --git a/include/configs/ns9750dev.h b/include/configs/ns9750dev.h
index e1806a70c60..1d691f9731d 100644
--- a/include/configs/ns9750dev.h
+++ b/include/configs/ns9750dev.h
@@ -70,6 +70,15 @@
 #define CONFIG_BAUDRATE		38400
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index 9ed1ed856c8..f1d73e4c539 100644
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -68,8 +68,6 @@
 #define CFG_RX_ETH_BUFFER	8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X		1
 
-#define ADD_PCI_CMD 		CFG_CMD_PCI
-
 /* Partitions */
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
@@ -78,6 +76,15 @@
 #define CONFIG_TIMESTAMP	/* Print image info with timestamp */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -89,7 +96,7 @@
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_PING
-#define CONFIG_PCI_CMD
+#define CONFIG_CMD_PCI
 
 
 #if (TEXT_BASE == 0xFF000000)		/* Boot low with 16 MB Flash */
diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h
index fd45c1d9705..bc2fd33ff5e 100644
--- a/include/configs/ocotea.h
+++ b/include/configs/ocotea.h
@@ -233,6 +233,15 @@
 #define CONFIG_NETCONSOLE		/* include NetConsole support	*/
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */