diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-07-10 10:12:10 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-07-10 10:12:10 -0500 |
| commit | 079a136c3588814784561d6e4856970ee82d6e2a (patch) | |
| tree | 08fe65aadd82a91c8d5b2afe9984b5710e97f291 /include/configs/pf5200.h | |
| parent | 7f5c01577400c74cc5bac74f41dd0d3c79df623c (diff) | |
| download | blackbird-obmc-uboot-079a136c3588814784561d6e4856970ee82d6e2a.tar.gz blackbird-obmc-uboot-079a136c3588814784561d6e4856970ee82d6e2a.zip | |
include/configs/[p-z]* + misc: 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/pf5200.h')
| -rw-r--r-- | include/configs/pf5200.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 3e72c652bc..18d0c879a9 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -85,13 +85,6 @@ #define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CONFIG_NS8382X 1 #endif - -#define ADD_PCI_CMD CFG_CMD_PCI - -#else /* MPC5100 */ - -#define ADD_PCI_CMD 0 /* no CFG_CMD_PCI */ - #endif /* Partitions */ @@ -101,26 +94,35 @@ /* USB */ #if 0 #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 /* + * 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> #define CONFIG_CMD_BSP -#define CONFIG_PCI_CMD #define CONFIG_CMD_EEPROM #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C #define CONFIG_CMD_IDE +#ifdef CONFIG_MPC5200 +#define CONFIG_CMD_PCI +#endif + #if (TEXT_BASE == 0xFF000000) /* Boot low with 16 MB Flash */ # define CFG_LOWBOOT 1 |
