From: Jon Loeliger Date: Tue, 10 Jul 2007 14:29:01 +0000 (-0500) Subject: include/configs/[a-e]*: Cleanup BOOTP and lingering CFG_CMD_*. X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=80ff4f99b84b64edca3fd10da365ec1493be1c95;p=u-boot.git include/configs/[a-e]*: 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 --- diff --git a/include/configs/adsvix.h b/include/configs/adsvix.h index 0d64013b21..703d3124e6 100644 --- a/include/configs/adsvix.h +++ b/include/configs/adsvix.h @@ -69,6 +69,15 @@ #define CONFIG_DOS_PARTITION 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/aev.h b/include/configs/aev.h index 93b20db5ce..5bab793e9c 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -91,6 +91,15 @@ #endif +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + + /* * Command line configuration. */ @@ -343,8 +352,7 @@ #endif /* - * 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/alpr.h b/include/configs/alpr.h index 27f2831b52..d88c3ad43b 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -211,6 +211,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. */ diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h index db57dc11f1..ecfa21d828 100644 --- a/include/configs/at91rm9200dk.h +++ b/include/configs/at91rm9200dk.h @@ -98,6 +98,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/bamboo.h b/include/configs/bamboo.h index c1fdaf8d57..19b29aaf36 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -317,6 +317,15 @@ #endif /*CONFIG_440EP*/ +/* + * 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/barco.h b/include/configs/barco.h index 09078d42c6..0bb446f784 100644 --- a/include/configs/barco.h +++ b/include/configs/barco.h @@ -92,6 +92,8 @@ #define CONFIG_CMD_EEPROM #define CONFIG_CMD_PCI +#undef CONFIG_CMD_NET + #define CONFIG_HUSH_PARSER 1 /* use "hush" command parser */ #define CONFIG_BOOTDELAY 1 @@ -116,7 +118,6 @@ */ #define CONFIG_PCI /* include pci support */ #undef CONFIG_PCI_PNP -#undef CFG_CMD_NET #define PCI_ENET0_IOADDR 0x80000000 #define PCI_ENET0_MEMADDR 0x80000000 diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 16892590e0..7736a1e32d 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -138,6 +138,15 @@ #define CONFIG_RTC_DS174x 1 /* use DS1743 RTC in Bubinga */ +/* + * 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/canmb.h b/include/configs/canmb.h index 9bb5b83047..d577b95e05 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -48,6 +48,15 @@ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } +/* + * 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/cerf250.h b/include/configs/cerf250.h index 0240ef2194..e06735da63 100644 --- a/include/configs/cerf250.h +++ b/include/configs/cerf250.h @@ -62,6 +62,15 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE +/* + * 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/cm4008.h b/include/configs/cm4008.h index d0ac46b3ca..ae40b358e9 100644 --- a/include/configs/cm4008.h +++ b/include/configs/cm4008.h @@ -59,6 +59,15 @@ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 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/cm41xx.h b/include/configs/cm41xx.h index b62e361173..c1dd33d1d2 100644 --- a/include/configs/cm41xx.h +++ b/include/configs/cm41xx.h @@ -59,6 +59,15 @@ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 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/cmc_pu2.h b/include/configs/cmc_pu2.h index 9e70900cb7..f32c8c2c66 100644 --- a/include/configs/cmc_pu2.h +++ b/include/configs/cmc_pu2.h @@ -113,6 +113,15 @@ #define CONFIG_BOOTDELAY 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/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h index dbc41e97fb..cd92af2352 100644 --- a/include/configs/cmi_mpc5xx.h +++ b/include/configs/cmi_mpc5xx.h @@ -45,6 +45,15 @@ #define CONFIG_BAUDRATE 57600 +/* + * 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/cobra5272.h b/include/configs/cobra5272.h index 4ab60cf271..510524ad36 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -131,6 +131,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/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h index 63150902c8..84d50c71dd 100644 --- a/include/configs/cogent_mpc8260.h +++ b/include/configs/cogent_mpc8260.h @@ -88,6 +88,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/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h index c246ff5e64..ce38af1dd8 100644 --- a/include/configs/cogent_mpc8xx.h +++ b/include/configs/cogent_mpc8xx.h @@ -59,6 +59,15 @@ #define CFG_I2C_SLAVE 0x7F +/* + * 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/cpci5200.h b/include/configs/cpci5200.h index c4ed19abdd..ce4ea1f8db 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -99,6 +99,15 @@ #define CONFIG_USB_STORAGE #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/cradle.h b/include/configs/cradle.h index 5d6419fe1f..eb93a8f083 100644 --- a/include/configs/cradle.h +++ b/include/configs/cradle.h @@ -62,6 +62,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/csb226.h b/include/configs/csb226.h index 04bdf867b1..0be0f21924 100644 --- a/include/configs/csb226.h +++ b/include/configs/csb226.h @@ -58,6 +58,15 @@ #undef CONFIG_MISC_INIT_R /* not used yet */ +/* + * 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/csb637.h b/include/configs/csb637.h index ac2fe54409..976dae39f6 100644 --- a/include/configs/csb637.h +++ b/include/configs/csb637.h @@ -100,6 +100,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/dbau1x00.h b/include/configs/dbau1x00.h index c0f5a09900..b2f606f498 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -80,6 +80,15 @@ #endif /* CONFIG_DBAU1550 */ +/* + * 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/debris.h b/include/configs/debris.h index 96c76483aa..7667e5e60e 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -123,6 +123,15 @@ #define CONFIG_DRAM_SPEED 100 /* MHz */ +/* + * 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/delta.h b/include/configs/delta.h index 7df72800f5..dbfe7a702b 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -88,6 +88,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/dnp1110.h b/include/configs/dnp1110.h index e58a2f219c..d32e046023 100644 --- a/include/configs/dnp1110.h +++ b/include/configs/dnp1110.h @@ -67,6 +67,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/eXalion.h b/include/configs/eXalion.h index ac1ef959a7..f8e2c885b0 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -58,6 +58,15 @@ /*#define CONFIG_DRAM_SPEED 66 */ /* MHz */ +/* + * 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/ebony.h b/include/configs/ebony.h index d86a9efbef..2c626a0328 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -209,6 +209,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. */ diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index 8653b55aff..85ad70a0d5 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -124,6 +124,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. */ @@ -192,13 +201,13 @@ #define CFG_JFFS2_LAST_SECTOR 62 #define CFG_JFFS2_SORT_FRAGMENTS #define CFG_JFFS_CUSTOM_PART -#endif /* CFG_CMD_JFFS2 */ +#endif #if defined(CONFIG_CMD_I2C) #define CONFIG_HARD_I2C 1 /* To enable I2C support */ #define CFG_I2C_SPEED 100000 /* I2C speed */ #define CFG_I2C_SLAVE 0x7F /* I2C slave address */ -#endif /* CFG_CMD_I2C */ +#endif #define CFG_MONITOR_BASE TEXT_BASE #if (CFG_MONITOR_BASE < CFG_FLASH_BASE) diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 25f9bd6a71..f412ec8ed8 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -291,6 +291,15 @@ #define CFG_PROMPT_HUSH_PS2 "> " +/* + * 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/ep82xxm.h b/include/configs/ep82xxm.h index 430ff4b8f4..4febd322a4 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -109,6 +109,15 @@ #define CFG_VXWORKS_MAC_PTR 0x4300 /* Pass Ethernet MAC to VxWorks */ +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + + /* * Command line configuration. */ @@ -318,13 +327,13 @@ #define CFG_JFFS2_LAST_SECTOR 62 #define CFG_JFFS2_SORT_FRAGMENTS #define CFG_JFFS_CUSTOM_PART -#endif /* CFG_CMD_JFFS2 */ +#endif #if defined(CONFIG_CMD_I2C) #define CONFIG_HARD_I2C 1 /* To enable I2C support */ #define CFG_I2C_SPEED 100000 /* I2C speed */ #define CFG_I2C_SLAVE 0x7F /* I2C slave address */ -#endif /* CFG_CMD_I2C */ +#endif #define CFG_MONITOR_BASE TEXT_BASE #if (CFG_MONITOR_BASE < CFG_FLASH_BASE)