From 5dc11a511960d490f7f01ffd746edfe6277f99b0 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Wed, 4 Jul 2007 22:33:01 -0500 Subject: include/configs: Use new CONFIG_CMD_* in various m* named board config files. Signed-off-by: Jon Loeliger --- include/configs/ml300.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'include/configs/ml300.h') diff --git a/include/configs/ml300.h b/include/configs/ml300.h index 6762cd6..423c6eb 100644 --- a/include/configs/ml300.h +++ b/include/configs/ml300.h @@ -87,13 +87,19 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */ -#define REMOVE_COMMANDS (CFG_CMD_FLASH | CFG_CMD_LOADS | CFG_CMD_FAT | \ - CFG_CMD_IMLS ) -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_NET) \ - & ~REMOVE_COMMANDS) -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include +/* + * Command line configuration. + */ +#include + +#define CONFIG_CMD_NET + +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_FAT +#undef CONFIG_CMD_IMLS + /* #define CONFIG_SYS_CLK_FREQ XPAR_CORE_CLOCK_FREQ_HZ */ /* 300000000 */ -- cgit v1.1 From 7f5c01577400c74cc5bac74f41dd0d3c79df623c Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 10 Jul 2007 09:38:02 -0500 Subject: include/configs/[g-o]*: 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 --- include/configs/ml300.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/configs/ml300.h') diff --git a/include/configs/ml300.h b/include/configs/ml300.h index 423c6eb..0183041 100644 --- a/include/configs/ml300.h +++ b/include/configs/ml300.h @@ -89,6 +89,15 @@ /* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + + +/* * Command line configuration. */ #include -- cgit v1.1