include/: Remove obsolete references to CONFIG_COMMANDS
PATCH 5/30 include/: Remove obsolete references to CONFIG_COMMANDS
Mostly removed from comments here.
Signed-off-by Jon Loeliger <[email protected]>
--- include/_exports.h | 2 +- include/configs/CPU86.h | 4 +--- include/configs/CPU87.h | 4 +--- include/configs/IDS8247.h | 4 +--- include/configs/IPHASE4539.h | 3 +-- include/configs/ISPAN.h | 3 +-- include/configs/MPC8260ADS.h | 3 +-- include/configs/MPC8266ADS.h | 3 +-- include/configs/PM826.h | 3 +-- include/configs/PM828.h | 3 +-- include/configs/RPXsuper.h | 3 +-- include/configs/Rattler.h | 4 ++-- include/configs/SCM.h | 3 +-- include/configs/TQM8260.h | 3 +-- include/configs/TQM8272.h | 3 +-- include/configs/VoVPN-GW.h | 3 +-- include/configs/ZPC1900.h | 4 ++-- include/configs/atc.h | 4 +--- include/configs/cogent_mpc8260.h | 3 +-- include/configs/ep8248.h | 4 ++-- include/configs/ep8260.h | 3 +-- include/configs/ep82xxm.h | 4 ++-- include/configs/gw8260.h | 3 +-- include/configs/hymod.h | 3 +-- include/configs/ppmc8260.h | 3 +-- include/configs/rsdproto.h | 3 +-- include/configs/sacsng.h | 3 +-- include/configs/sbc8260.h | 3 +-- include/configs/sc3.h | 3 +-- include/exports.h | 2 +- include/lcd.h | 4 ++-- include/mk48t59.h | 2 +- include/net.h | 6 +++--- include/pcmcia.h | 6 +++--- 34 files changed, 43 insertions(+), 71 deletions(-)
include/_exports.h +1 -1
@@ -15,7 +15,7 @@ EXPORT_FUNC(do_reset) EXPORT_FUNC(getenv) EXPORT_FUNC(setenv) EXPORT_FUNC(simple_strtoul) -#if (CONFIG_COMMANDS &CFG_CMD_I2C ) || defined(CONFIG_CMD_I2C ) +#if defined(CONFIG_CMD_I2C ) EXPORT_FUNC(i2c_write) EXPORT_FUNC(i2c_read)#endif /* CFG_CMD_I2C */
include/configs/CPU86.h +1 -3
@@ -68,9 +68,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. -* +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/CPU87.h +1 -3
@@ -69,9 +69,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. -* +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/IDS8247.h +1 -3
@@ -128,9 +128,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. -* +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/IPHASE4539.h +1 -2
@@ -67,8 +67,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/ISPAN.h +1 -2
@@ -58,8 +58,7 @@* for FCC). * * If CONFIG_ETHER_NONE is defined, then either the Ethernet routines must -* be defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* be defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* Define if Ethernet on SCC */ #define CONFIG_ETHER_ON_FCC /* Define if Ethernet on FCC */
include/configs/MPC8260ADS.h +1 -2
@@ -101,8 +101,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/MPC8266ADS.h +1 -2
@@ -83,8 +83,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/PM826.h +1 -2
@@ -103,8 +103,7 @@* - CONFIG_NET_MULTI must be defined * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #define CONFIG_NET_MULTI #undef CONFIG_ETHER_NONE/* define if ether on something else */
include/configs/PM828.h +1 -2
@@ -103,8 +103,7 @@* - CONFIG_NET_MULTI must be defined * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #define CONFIG_NET_MULTI #undef CONFIG_ETHER_NONE/* define if ether on something else */
include/configs/RPXsuper.h +1 -2
@@ -91,8 +91,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ethernet on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ethernet on FCC */
include/configs/Rattler.h +2 -2
@@ -62,8 +62,8 @@* SCC, 1-3 for FCC) * * If CONFIG_ETHER_NONE is defined, then either the ethernet routines -* must be defined elsewhere (as for the console), or CFG_CMD_NET must -* be removed from CONFIG_COMMANDS to remove support for networking. +* must be defined elsewhere (as for the console), or CONFIG_CMD_NET +* must be unset. */ #undef CONFIG_ETHER_ON_SCC/* Ethernet is not on SCC */ #define CONFIG_ETHER_ON_FCC /* Ethernet is on FCC */
include/configs/SCM.h +1 -2
@@ -133,8 +133,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. * * (On TQM8260 either SCC1 or FCC2 may be chosen: SCC1 is hardwired to the * X.29 connector, and FCC2 is hardwired to the X.1 connector)
include/configs/TQM8260.h +1 -2
@@ -167,8 +167,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. * * (On TQM8260 either SCC1 or FCC2 may be chosen: SCC1 is hardwired to the * X.29 connector, and FCC2 is hardwired to the X.1 connector)
include/configs/TQM8272.h +1 -2
@@ -177,8 +177,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. * * (On TQM8272 either SCC1 or FCC2 may be chosen: SCC1 is hardwired to the * X.29 connector, and FCC2 is hardwired to the X.1 connector)
include/configs/VoVPN-GW.h +1 -2
@@ -95,8 +95,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC#define CONFIG_ETHER_ON_FCC
include/configs/ZPC1900.h +2 -2
@@ -55,8 +55,8 @@* SCC, 1-3 for FCC) * * If CONFIG_ETHER_NONE is defined, then either the ethernet routines -* must be defined elsewhere (as for the console), or CFG_CMD_NET must -* be removed from CONFIG_COMMANDS to remove support for networking. +* must be defined elsewhere (as for the console), or CONFIG_CMD_NET +* must be unset. */ #undef CONFIG_ETHER_ON_SCC/* Ethernet is not on SCC */ #define CONFIG_ETHER_ON_FCC /* Ethernet is on FCC */
include/configs/atc.h +1 -3
@@ -64,9 +64,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. -* +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #undef CONFIG_ETHER_NONE/* define if ether on something else */
include/configs/cogent_mpc8260.h +1 -2
@@ -71,8 +71,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #undef CONFIG_ETHER_ON_FCC/* define if ether on FCC */
include/configs/ep8248.h +2 -2
@@ -60,8 +60,8 @@* SCC, 1-3 for FCC) * * If CONFIG_ETHER_NONE is defined, then either the ethernet routines -* must be defined elsewhere (as for the console), or CFG_CMD_NET must -* be removed from CONFIG_COMMANDS to remove support for networking. +* must be defined elsewhere (as for the console), or CONFIG_CMD_NET +* must be unset. */ #undef CONFIG_ETHER_ON_SCC/* Ethernet is not on SCC */ #define CONFIG_ETHER_ON_FCC /* Ethernet is on FCC */
include/configs/ep8260.h +1 -2
@@ -183,8 +183,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ethernet on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ethernet on FCC */
include/configs/ep82xxm.h +2 -2
@@ -60,8 +60,8 @@* SCC, 1-3 for FCC) * * If CONFIG_ETHER_NONE is defined, then either the ethernet routines -* must be defined elsewhere (as for the console), or CFG_CMD_NET must -* be removed from CONFIG_COMMANDS to remove support for networking. +* must be defined elsewhere (as for the console), or CONFIG_CMD_NET +* must be unset. */ #undef CONFIG_ETHER_ON_SCC/* Ethernet is not on SCC */ #define CONFIG_ETHER_ON_FCC /* Ethernet is on FCC */
include/configs/gw8260.h +1 -2
@@ -194,8 +194,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC
include/configs/hymod.h +1 -2
@@ -69,8 +69,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ether on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ether on FCC */
include/configs/ppmc8260.h +1 -2
@@ -169,8 +169,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ethernet on SCC */
include/configs/rsdproto.h +1 -2
@@ -64,8 +64,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC/* define if ethernet on SCC */ #define CONFIG_ETHER_ON_FCC /* define if ethernet on FCC */
include/configs/sacsng.h +1 -2
@@ -159,8 +159,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC
include/configs/sbc8260.h +1 -2
@@ -182,8 +182,7 @@* for FCC) * * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be -* defined elsewhere (as for the console), or CFG_CMD_NET must be removed -* from CONFIG_COMMANDS to remove support for networking. +* defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset. */ #undef CONFIG_ETHER_ON_SCC
include/configs/sc3.h +1 -2
@@ -68,8 +68,7 @@* Define IDE_USES_ISA_EMULATION for slower IDE access in the ISA-IO address range * If undefined, IDE access uses a seperat emulation with higher access speed. * Consider to inform your Linux IDE driver about the different addresses! -* IDE_USES_ISA_EMULATION is only used if your CONFIG_COMMANDS macro includes -* the CFG_CMD_IDE macro! +* IDE_USES_ISA_EMULATION is only used if you define CONFIG_CMD_IDE! */ #define IDE_USES_ISA_EMULATION
include/exports.h +1 -1
@@ -23,7 +23,7 @@ void do_reset (void);unsigned long simple_strtoul (const char *cp,char **endp,unsigned int base);char *getenv (char *name);void setenv (char *varname,char *varvalue); -#if (CONFIG_COMMANDS &CFG_CMD_I2C ) || defined(CONFIG_CMD_I2C ) +#if defined(CONFIG_CMD_I2C )int i2c_write (uchar ,uint ,int ,uchar * ,int );int i2c_read (uchar ,uint ,int ,uchar * ,int );#endif /* CFG_CMD_I2C */
include/lcd.h +2 -2
@@ -173,10 +173,10 @@ void lcd_printf (const char *fmt, ...);/************************************************************************/ /* ** BITMAP DISPLAY SUPPORT */ /************************************************************************/ -#if (CONFIG_COMMANDS &CFG_CMD_BMP ) || defined(CONFIG_CMD_BMP ) || defined(CONFIG_SPLASH_SCREEN ) +#if defined(CONFIG_CMD_BMP ) || defined(CONFIG_SPLASH_SCREEN )# include <bmp_layout.h> # include <asm/byteorder.h> -#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ +#endif /* * Information about displays we are using. This is for configuring
include/mk48t59.h +1 -1
@@ -26,7 +26,7 @@*/ -#if defined(CONFIG_RTC_MK48T59 ) && ((CONFIG_COMMANDS &CFG_CMD_DATE ) || defined(CONFIG_CMD_DATE )) +#if defined(CONFIG_RTC_MK48T59 ) && defined(CONFIG_CMD_DATE )#define RTC_PORT_ADDR0 CFG_ISA_IO + 0x70#define RTC_PORT_ADDR1 RTC_PORT_ADDR0 + 0x1
include/net.h +3 -3
@@ -341,17 +341,17 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP/* from net/net.c */ extern char BootFile[128 ];/* Boot File name */ -#if (CONFIG_COMMANDS &CFG_CMD_PING ) || defined(CONFIG_CMD_PING ) +#if defined(CONFIG_CMD_PING )extern IPaddr_t NetPingIP;/* the ip address to ping */ #endif -#if (CONFIG_COMMANDS &CFG_CMD_CDP ) || defined(CONFIG_CMD_CDP ) +#if defined(CONFIG_CMD_CDP )/* when CDP completes these hold the return values */ extern ushort CDPNativeVLAN;extern ushort CDPApplianceVLAN;#endif -#if (CONFIG_COMMANDS &CFG_CMD_SNTP ) || defined(CONFIG_CMD_SNTP ) +#if defined(CONFIG_CMD_SNTP )extern IPaddr_t NetNtpServerIP;/* the ip address to NTP */ extern int NetTimeOffset;/* offset time from UTC */ #endif
include/pcmcia.h +3 -3
@@ -31,8 +31,8 @@* Allow configuration to select PCMCIA slot, * or try to generate a useful default */ -#if (CONFIG_COMMANDS &CFG_CMD_PCMCIA ) || defined(CONFIG_CMD_PCMCIA ) || \ - (((CONFIG_COMMANDS &CFG_CMD_IDE ) || defined(CONFIG_CMD_IDE )) && \ +#if defined(CONFIG_CMD_PCMCIA ) || \ + (defined(CONFIG_CMD_IDE ) && \ (defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT) ) )#if !defined(CONFIG_PCMCIA_SLOT_A ) && !defined(CONFIG_PCMCIA_SLOT_B )
@@ -313,7 +313,7 @@ extern u_int *pcmcia_pgcrx[];#define PCMCIA_PGCRX (slot) (*pcmcia_pgcrx[slot])#endif -#if ((CONFIG_COMMANDS &CFG_CMD_IDE ) || defined(CONFIG_CMD_IDE )) && defined(CONFIG_IDE_8xx_PCCARD) \ +#if defined(CONFIG_CMD_IDE ) && defined(CONFIG_IDE_8xx_PCCARD) \ || defined(CONFIG_PXA_PCMCIA )extern int check_ide_device (int slot);#endif
Signature · 1 line
1.5.2.2.249.g45fd