diff options
| -rw-r--r-- | include/configs/BC3450.h | 8 | ||||
| -rw-r--r-- | include/configs/GEN860T.h | 10 | ||||
| -rw-r--r-- | include/configs/KUP4K.h | 10 | ||||
| -rw-r--r-- | include/configs/KUP4X.h | 10 | ||||
| -rw-r--r-- | include/configs/TB5200.h | 16 | ||||
| -rw-r--r-- | include/configs/TQM5200.h | 8 | ||||
| -rw-r--r-- | include/configs/aev.h | 8 | ||||
| -rw-r--r-- | include/configs/bf537-stamp.h | 8 | ||||
| -rw-r--r-- | include/configs/lwmon.h | 11 | ||||
| -rw-r--r-- | include/configs/smmaco4.h | 8 | ||||
| -rw-r--r-- | include/configs/spieval.h | 30 | ||||
| -rw-r--r-- | include/configs/uc100.h | 11 | 
12 files changed, 60 insertions, 78 deletions
| diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 00b656e73..aec4d83f2 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -138,11 +138,8 @@  				 CFG_POST_I2C)  #ifdef CONFIG_POST -# define CFG_CMD_POST_DIAG CFG_CMD_DIAG  /* preserve space for the post_word at end of on-chip SRAM */  # define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 -#else -# define CFG_CMD_POST_DIAG 0  #endif /* CONFIG_POST */ @@ -161,7 +158,6 @@  #define CONFIG_CMD_MII  #define CONFIG_CMD_NFS  #define CONFIG_CMD_PING -#define CONFIG_CMD_POST_DIAG  #define CONFIG_CMD_REGINFO  #define CONFIG_CMD_SNTP  #define CONFIG_CMD_BSP @@ -192,6 +188,10 @@      #define CONFIG_CMD_PCI  #endif +#ifdef CONFIG_POST +    #define CONFIG_CMD_DIAG +#endif +  #define CONFIG_TIMESTAMP		/* display image timestamps */ diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 612b661ad..2b2d15a76 100644 --- a/include/configs/GEN860T.h +++ b/include/configs/GEN860T.h @@ -222,12 +222,6 @@  								CFG_POST_UART		| \  								CFG_POST_SPR ) -#ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG -#else -#define CFG_CMD_POST_DIAG		0 -#endif -  /*   * Command line configuration. @@ -245,12 +239,14 @@  #define CONFIG_CMD_FPGA  #define CONFIG_CMD_MII  #define CONFIG_CMD_BEDBUG -#define CONFIG_CMD_POST_DIAG  #if !defined(CONFIG_SC)      #define CONFIG_CMD_DOC  #endif +#ifdef CONFIG_POST +u #define CONFIG_CMD_DIAG +#endif  /*   * There is no IDE/PCMCIA hardware support on the board. diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index 242220176..2f056059c 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -156,12 +156,6 @@  #define CONFIG_POST		(CFG_POST_CPU	   | \  				 CFG_POST_RTC	   | \  				 CFG_POST_I2C) - -#ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG -#else -#define CFG_CMD_POST_DIAG 0 -#endif  #endif @@ -175,9 +169,11 @@  #define CONFIG_CMD_I2C  #define CONFIG_CMD_IDE  #define CONFIG_CMD_NFS -#define CONFIG_CMD_POST_DIAG  #define CONFIG_CMD_SNTP +#ifdef CONFIG_POST +    #define CONFIG_CMD_DIAG +#endif  /*   * Miscellaneous configurable options diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index 184338b97..c59b70f15 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -167,12 +167,6 @@  #define CONFIG_POST		(CFG_POST_CPU	   | \  				 CFG_POST_RTC	   | \  				 CFG_POST_I2C) - -#ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG -#else -#define CFG_CMD_POST_DIAG 0 -#endif  #endif @@ -187,10 +181,12 @@  #define CONFIG_CMD_I2C  #define CONFIG_CMD_IDE  #define CONFIG_CMD_NFS -#define CONFIG_CMD_POST_DIAG  #define CONFIG_CMD_SNTP  #define CONFIG_CMD_USB +#ifdef CONFIG_POST +    #define CONFIG_CMD_DIAG +#endif  /*   * Miscellaneous configurable options diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index f64c52222..3d90efb1c 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -82,11 +82,8 @@  				 CFG_POST_I2C)  #ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG  /* preserve space for the post_word at end of on-chip SRAM */  #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 -#else -#define CFG_CMD_POST_DIAG 0  #endif @@ -95,10 +92,6 @@   */  #include <config_cmd_default.h> -#ifdef CONFIG_VIDEO -#define CONFIG_CMD_BMP -#endif -  #define CONFIG_CMD_ASKENV  #define CONFIG_CMD_DATE  #define CONFIG_CMD_DHCP @@ -112,12 +105,19 @@  #define CONFIG_CMD_MII  #define CONFIG_CMD_NFS  #define CONFIG_CMD_PING -#define CONFIG_CMD_POST_DIAG  #define CONFIG_CMD_REGINFO  #define CONFIG_CMD_SNTP  #define CONFIG_CMD_BSP  #define CONFIG_CMD_USB +#ifdef CONFIG_VIDEO +#define CONFIG_CMD_BMP +#endif + +#ifdef CONFIG_POST +#define CONFIG__CMD_DIAG +#endif +  #define	CONFIG_TIMESTAMP		/* display image timestamps */ diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 24114b82d..598c1c61c 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -142,11 +142,8 @@  #endif  #ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG  /* preserve space for the post_word at end of on-chip SRAM */  #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 -#else -#define CFG_CMD_POST_DIAG 0  #endif @@ -164,7 +161,6 @@  #define CONFIG_CMD_MII  #define CONFIG_CMD_NFS  #define CONFIG_CMD_PING -#define CONFIG_CMD_POST_DIAG  #define CONFIG_CMD_REGINFO  #define CONFIG_CMD_SNTP  #define CONFIG_CMD_BSP @@ -188,6 +184,10 @@      #define CONFIG_CFG_FAT  #endif +#ifdef CONFIG_POST +    #define CONFIG_CMD_DIAG +#endif +  #define	CONFIG_TIMESTAMP		/* display image timestamps */ diff --git a/include/configs/aev.h b/include/configs/aev.h index ecd84d3e2..93b20db5c 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -86,11 +86,8 @@  				 CFG_POST_I2C)  #ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG  /* preserve space for the post_word at end of on-chip SRAM */  #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 -#else -#define CFG_CMD_POST_DIAG 0  #endif @@ -109,10 +106,13 @@  #define CONFIG_CMD_NFS  #define CONFIG_CMD_PCI  #define CONFIG_CMD_PING -#define CONFIG_CMD_POST  #define CONFIG_CMD_REGINFO  #define CONFIG_CMD_SNTP +#ifdef CONFIG_POST +#define CONFIG_CMD_DIAG +#endif +  #define	CONFIG_TIMESTAMP		/* display image timestamps */ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 36f55d164..bea157a45 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -144,11 +144,8 @@  #endif  #ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG	CFG_CMD_DIAG  #define FLASH_START_POST_BLOCK	11	/* Should > = 11 */  #define FLASH_END_POST_BLOCK	71	/* Should < = 71 */ -#else -#define CFG_CMD_POST_DIAG	0  #endif  /* CF-CARD IDE-HDD Support */ @@ -197,7 +194,10 @@  #if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT)  #define CONFIG_CMD_DHCP -#define CONFIG_CMD_POST_DIAG + +#if defined(CONFIG_POST) +#define CONFIG_CMD_DIAG +#endif  #ifdef CONFIG_BF537_NAND  #define CONFIG_CMD_NAND diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 3dc7a8eb6..1db5e9096 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -170,12 +170,6 @@  #define CONFIG_RTC_PCF8563		/* use Philips PCF8563 RTC	*/ -#ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG -#else -#define CFG_CMD_POST_DIAG 0 -#endif -  /*   * Command line configuration. @@ -192,9 +186,12 @@  #define CONFIG_CMD_I2C  #define CONFIG_CMD_IDE  #define CONFIG_CMD_NFS -#define CONFIG_CMD_POST  #define CONFIG_CMD_SNTP +#ifdef CONFIG_POST +#define CONFIG_CMD_DIAG +#endif +  #define CONFIG_MAC_PARTITION  #define CONFIG_DOS_PARTITION diff --git a/include/configs/smmaco4.h b/include/configs/smmaco4.h index 8d098579d..a965e8ac8 100644 --- a/include/configs/smmaco4.h +++ b/include/configs/smmaco4.h @@ -60,11 +60,8 @@  				 CFG_POST_I2C)  #ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG  /* preserve space for the post_word at end of on-chip SRAM */  #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 -#else -#define CFG_CMD_POST_DIAG 0  #endif @@ -82,10 +79,13 @@  #define CONFIG_CMD_MII  #define CONFIG_CMD_NFS  #define CONFIG_CMD_PING -#define CONFIG_CMD_POST  #define CONFIG_CMD_REGINFO  #define CONFIG_CMD_SNTP +#ifdef CONFIG_POST +#define CONFIG_CMD_DIAG +#endif +  #define	CONFIG_TIMESTAMP		/* display image timestamps */ diff --git a/include/configs/spieval.h b/include/configs/spieval.h index e480df5f9..ccfcf1c8d 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -116,11 +116,8 @@  				 CFG_POST_I2C)  #ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG CFG_CMD_DIAG  /* preserve space for the post_word at end of on-chip SRAM */  #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 -#else -#define CFG_CMD_POST_DIAG 0  #endif @@ -129,6 +126,18 @@   */  #include <config_cmd_default.h> +#define CONFIG_CMD_ASKENV +#define CONFIG_CMD_DATE +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ECHO +#define CONFIG_CMD_EEPROM +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MII +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PING +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_SNTP +  #if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX)      #define CONFIG_CMD_IDE      #define CONFIG_CMD_FAT @@ -148,18 +157,9 @@      #define CONFIG_CMD_PCI  #endif -#define CONFIG_CMD_ASKENV -#define CONFIG_CMD_DATE -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_ECHO -#define CONFIG_CMD_EEPROM -#define CONFIG_CMD_I2C -#define CONFIG_CMD_MII -#define CONFIG_CMD_NFS -#define CONFIG_CMD_PING -#define CONFIG_CMD_POST -#define CONFIG_CMD_REGINFO -#define CONFIG_CMD_SNTP +#ifdef CONFIG_POST +#define CONFIG_CMD_DIAG +#endif  #define	CONFIG_TIMESTAMP		/* display image timestamps */ diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 2bdc55b46..d223c58da 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -117,12 +117,6 @@  				CFG_POST_SPR )  #undef  CONFIG_POST -#ifdef CONFIG_POST -#define CFG_CMD_POST_DIAG       CFG_CMD_DIAG -#else -#define CFG_CMD_POST_DIAG	0 -#endif -  /*   * Command line configuration. @@ -140,9 +134,12 @@  #define CONFIG_CMD_MII  #define CONFIG_CMD_NFS  #define CONFIG_CMD_PING -#define CONFIG_CMD_POST  #define CONFIG_CMD_SNTP +#ifdef CONFIG_POST +#define CONFIG_CMD_DIAG +#endif +  #define CONFIG_NETCONSOLE |