diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cmd_confdefs.h | 13 | ||||
| -rw-r--r-- | include/configs/ADNPESC1.h | 1 | ||||
| -rw-r--r-- | include/configs/DK1C20.h | 3 | ||||
| -rw-r--r-- | include/configs/DK1S10.h | 3 | ||||
| -rw-r--r-- | include/configs/LANTEC.h | 3 | ||||
| -rw-r--r-- | include/configs/MPC8260ADS.h | 5 | ||||
| -rw-r--r-- | include/configs/MPC8266ADS.h | 5 | ||||
| -rw-r--r-- | include/configs/RBC823.h | 5 | ||||
| -rw-r--r-- | include/configs/RPXClassic.h | 2 | ||||
| -rw-r--r-- | include/configs/ZPC1900.h | 3 | ||||
| -rw-r--r-- | include/configs/ep8260.h | 5 | ||||
| -rw-r--r-- | include/configs/hymod.h | 3 | 
12 files changed, 31 insertions, 20 deletions
| diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h index 7a4dfe1ec..877753ecf 100644 --- a/include/cmd_confdefs.h +++ b/include/cmd_confdefs.h @@ -22,7 +22,7 @@   */  /* - *  Definitions for Configuring the monitor commands + * Definitions for Configuring the monitor commands   */  #ifndef _CMD_CONFIG_H  #define _CMD_CONFIG_H @@ -78,17 +78,18 @@  #define CFG_CMD_SPI	0x0000100000000000U	/* SPI utility			*/  #define CFG_CMD_FDOS	0x0000200000000000U	/* Floppy DOS support		*/  #define CFG_CMD_VFD	0x0000400000000000U	/* VFD support (TRAB)		*/ -#define CFG_CMD_NAND	0x0000800000000000U	/* NAND support        		*/ +#define CFG_CMD_NAND	0x0000800000000000U	/* NAND support			*/  #define CFG_CMD_BMP	0x0001000000000000U	/* BMP support			*/ -#define CFG_CMD_PORTIO	0x0002000000000000U	/* Port I/O		        */ +#define CFG_CMD_PORTIO	0x0002000000000000U	/* Port I/O			*/  #define CFG_CMD_PING	0x0004000000000000U	/* ping support			*/  #define CFG_CMD_MMC	0x0008000000000000U	/* MMC support			*/  #define CFG_CMD_FAT	0x0010000000000000U	/* FAT support			*/ -#define CFG_CMD_IMLS	0x0020000000000000U	/* List all found images        */ +#define CFG_CMD_IMLS	0x0020000000000000U	/* List all found images	*/  #define CFG_CMD_ITEST	0x0040000000000000U	/* Integer (and string) test	*/  #define CFG_CMD_NFS	0x0080000000000000U	/* NFS support			*/ -#define CFG_CMD_REISER  0x0100000000000000U     /* Reiserfs support		*/ +#define CFG_CMD_REISER	0x0100000000000000U	/* Reiserfs support		*/  #define CFG_CMD_CDP	0x0200000000000000U	/* Cisco Discovery Protocol 	*/ +#define CFG_CMD_XIMG	0x0400000000000000U	/* Load part of Multi Image	*/  #define CFG_CMD_ALL	0xFFFFFFFFFFFFFFFFU	/* ALL commands			*/ @@ -156,7 +157,7 @@  #define CONFIG_BOOTP_BOOTFILESIZE	0x00000020  #define CONFIG_BOOTP_DNS		0x00000040  #define CONFIG_BOOTP_DNS2		0x00000080 -#define CONFIG_BOOTP_SEND_HOSTNAME      0x00000100 +#define CONFIG_BOOTP_SEND_HOSTNAME	0x00000100  #define CONFIG_BOOTP_VENDOREX		0x80000000 diff --git a/include/configs/ADNPESC1.h b/include/configs/ADNPESC1.h index e2dc34327..2d212c91c 100644 --- a/include/configs/ADNPESC1.h +++ b/include/configs/ADNPESC1.h @@ -599,6 +599,7 @@  				 CFG_CMD_SCSI	| \  				 CFG_CMD_VFD	| \  				 CFG_CMD_USB	| \ +				 CFG_CMD_XIMG	| \  				 __SPI_CMD_OFF	) ) diff --git a/include/configs/DK1C20.h b/include/configs/DK1C20.h index 358f7f4b9..b758e94e7 100644 --- a/include/configs/DK1C20.h +++ b/include/configs/DK1C20.h @@ -475,7 +475,8 @@  				 CFG_CMD_SCSI	| \  				 CFG_CMD_SPI	| \  				 CFG_CMD_VFD	| \ -				 CFG_CMD_USB	) ) +				 CFG_CMD_USB	| \ +				 CFG_CMD_XIMG	) )  #include <cmd_confdefs.h> diff --git a/include/configs/DK1S10.h b/include/configs/DK1S10.h index db8c05a98..b2e86c84a 100644 --- a/include/configs/DK1S10.h +++ b/include/configs/DK1S10.h @@ -484,7 +484,8 @@  				 CFG_CMD_SCSI	| \  				 CFG_CMD_SPI	| \  				 CFG_CMD_VFD	| \ -				 CFG_CMD_USB	) ) +				 CFG_CMD_USB	| \ +				 CFG_CMD_XIMG	) )  #include <cmd_confdefs.h> diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h index 49ffb931e..17402f0c9 100644 --- a/include/configs/LANTEC.h +++ b/include/configs/LANTEC.h @@ -107,7 +107,8 @@  					     & ~CFG_CMD_SCSI	\  					     & ~CFG_CMD_SPI	\  					     & ~CFG_CMD_USB	\ -					     & ~CFG_CMD_VFD	) +					     & ~CFG_CMD_VFD	\ +					     & ~CFG_CMD_XIMG	)  #if CONFIG_LANTEC >= 2  #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/ diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 7bd0d8e88..626f23b6a 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -195,11 +195,12 @@  				 CFG_CMD_NAND	| \  				 CFG_CMD_PCI	| \  				 CFG_CMD_PCMCIA | \ -				CFG_CMD_REISER	| \ +				 CFG_CMD_REISER	| \  				 CFG_CMD_SCSI	| \  				 CFG_CMD_SPI	| \  				 CFG_CMD_USB	| \ -				 CFG_CMD_VFD +				 CFG_CMD_VFD	| \ +				 CFG_CMD_XIMG  #if CONFIG_ADSTYPE >= CFG_PQ2FADS  #define CONFIG_COMMANDS		(CFG_CMD_ALL & ~( \ diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 86a5986cf..a4018f8ce 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -164,11 +164,12 @@  				 CFG_CMD_MMC	| \  				 CFG_CMD_NAND	| \  				 CFG_CMD_PCMCIA | \ -				CFG_CMD_REISER	| \ +				 CFG_CMD_REISER	| \  				 CFG_CMD_SCSI	| \  				 CFG_CMD_SPI	| \  				 CFG_CMD_VFD	| \ -				 CFG_CMD_USB	) ) +				 CFG_CMD_USB	| \ +				 CFG_CMD_XIMG	) )  /* Define a command string that is automatically executed when no character   * is read on the console interface withing "Boot Delay" after reset. diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 1666d646c..3592290d5 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -111,10 +111,11 @@  				~CFG_CMD_PCMCIA	& \  				~CFG_CMD_REISER	& \  				~CFG_CMD_SCSI	& \ -				~CFG_CMD_SETGETDCR	& \ +				~CFG_CMD_SETGETDCR & \  				~CFG_CMD_SPI	& \  				~CFG_CMD_USB	& \ -				~CFG_CMD_VFD	) +				~CFG_CMD_VFD	& \ +				~CFG_CMD_XIMG	)  /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */  #include <cmd_confdefs.h> diff --git a/include/configs/RPXClassic.h b/include/configs/RPXClassic.h index 9746b64b0..7294561b0 100644 --- a/include/configs/RPXClassic.h +++ b/include/configs/RPXClassic.h @@ -93,7 +93,7 @@  #define	CONFIG_CLOCKS_IN_MHZ	1	/* clocks passsed to Linux in MHz */ -#define CONFIG_COMMANDS	(CFG_CMD_ALL & ~CFG_CMD_NONSTD | CFG_CMD_ELF) +#define CONFIG_COMMANDS	((CFG_CMD_ALL & ~CFG_CMD_NONSTD) | CFG_CMD_ELF)  /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */  #include <cmd_confdefs.h> diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 03331d6c0..d3c8eb9c0 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -134,7 +134,8 @@  				 CFG_CMD_SCSI	| \  				 CFG_CMD_SPI	| \  				 CFG_CMD_USB	| \ -				 CFG_CMD_VFD    ) ) +				 CFG_CMD_VFD    | \ +				 CFG_CMD_XIMG	) )  /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */  #include <cmd_confdefs.h> diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index 274bd7d17..d8db530e1 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -275,6 +275,7 @@  					~CFG_CMD_DCR    & \  					~CFG_CMD_DHCP   & \  					~CFG_CMD_DOC    & \ +					~CFG_CMD_DTT	& \  					~CFG_CMD_EEPROM & \  					~CFG_CMD_FDC    & \  					~CFG_CMD_FDOS	& \ @@ -287,12 +288,12 @@  					~CFG_CMD_NAND	& \  					~CFG_CMD_PCI    & \  					~CFG_CMD_PCMCIA & \ -					~CFG_CMD_SCSI   & \  					~CFG_CMD_REISER	& \ +					~CFG_CMD_SCSI   & \  					~CFG_CMD_SPI	& \  					~CFG_CMD_USB	& \  					~CFG_CMD_VFD	& \ -					~CFG_CMD_DTT ) +					~CFG_CMD_XIMG	)  /* Where do the internal registers live? */  #define CFG_IMMR               0xF0000000 diff --git a/include/configs/hymod.h b/include/configs/hymod.h index 75f52b5a5..6f1990961 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -191,7 +191,8 @@  					CFG_CMD_REISER	| \  					CFG_CMD_SCSI	| \  					CFG_CMD_SPI	| \ -					CFG_CMD_VFD	) ) +					CFG_CMD_VFD	| \ +					CFG_CMD_XIMG	) )  /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */  #include <cmd_confdefs.h> |