summaryrefslogtreecommitdiff
path: root/include/configs/IceCube.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-10 09:02:57 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-10 09:03:20 -0500
commit11799434c5ff15a612577bb1ad1f4ea1a0595e4b (patch)
treed73708537e669618cb12ba667b888764554680a2 /include/configs/IceCube.h
parent1fe80d79c5c4e52d3410a7ab4b8515da095cdab3 (diff)
downloadu-boot-imx-11799434c5ff15a612577bb1ad1f4ea1a0595e4b.zip
u-boot-imx-11799434c5ff15a612577bb1ad1f4ea1a0595e4b.tar.gz
u-boot-imx-11799434c5ff15a612577bb1ad1f4ea1a0595e4b.tar.bz2
include/configs/[A-I]*: Cleanup BOOTP and lingering CFG_CMD_*.
Explicitly add in default CONFIG_BOOTP_* options where cmd_confdefs.h used to be included but CONFIG_BOOTP_MASK was not defined. Remove lingering references to CFG_CMD_* symbols. Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/IceCube.h')
-rw-r--r--include/configs/IceCube.h25
1 files changed, 15 insertions, 10 deletions
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index c80c2d4..cc902c8 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -64,7 +64,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
@@ -75,11 +74,8 @@
#define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
#define CONFIG_NS8382X 1
-#else /* MPC5100 */
-
+#else
#define CONFIG_MII 1
-#define ADD_PCI_CMD 0 /* no CFG_CMD_PCI */
-
#endif
/* Partitions */
@@ -90,16 +86,22 @@
/* USB */
#if 1
#define CONFIG_USB_OHCI
-#define ADD_USB_CMD CFG_CMD_USB | CFG_CMD_FAT
#define CONFIG_USB_STORAGE
-#else
-#define ADD_USB_CMD 0
#endif
#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.
*/
#include <config_cmd_default.h>
@@ -110,8 +112,11 @@
#define CONFIG_CMD_IDE
#define CONFIG_CMD_NFS
#define CONFIG_CMD_SNTP
-#define CONFIG_PCI_CMD
-#define CONFIG_USB_CMD
+#define CONFIG_CMD_USB
+
+#if defined(CONFIG_PCI)
+#define CONFIG_CMD_PCI
+#endif
#if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */