Clear up confusion over the CMD_POST and POST_DIAG mess.

For some reason, CONFIG_POST permeated as CONFIG_CMD_POST_DIAG
when it really means just CONFIG_CMD_DIAG.  There is no CMD_POST.
Clear this mess up some.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-08 17:02:01 -05:00
parent b363148710
commit af075ee96e
12 changed files with 60 additions and 78 deletions

View file

@ -138,11 +138,8 @@
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST #ifdef CONFIG_POST
# define CFG_CMD_POST_DIAG CFG_CMD_DIAG
/* preserve space for the post_word at end of on-chip SRAM */ /* preserve space for the post_word at end of on-chip SRAM */
# define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 # define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
#else
# define CFG_CMD_POST_DIAG 0
#endif /* CONFIG_POST */ #endif /* CONFIG_POST */
@ -161,7 +158,6 @@
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_POST_DIAG
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#define CONFIG_CMD_BSP #define CONFIG_CMD_BSP
@ -192,6 +188,10 @@
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#endif #endif
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */

View file

@ -222,12 +222,6 @@
CFG_POST_UART | \ CFG_POST_UART | \
CFG_POST_SPR ) 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. * Command line configuration.
@ -245,12 +239,14 @@
#define CONFIG_CMD_FPGA #define CONFIG_CMD_FPGA
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_BEDBUG #define CONFIG_CMD_BEDBUG
#define CONFIG_CMD_POST_DIAG
#if !defined(CONFIG_SC) #if !defined(CONFIG_SC)
#define CONFIG_CMD_DOC #define CONFIG_CMD_DOC
#endif #endif
#ifdef CONFIG_POST
u #define CONFIG_CMD_DIAG
#endif
/* /*
* There is no IDE/PCMCIA hardware support on the board. * There is no IDE/PCMCIA hardware support on the board.

View file

@ -156,12 +156,6 @@
#define CONFIG_POST (CFG_POST_CPU | \ #define CONFIG_POST (CFG_POST_CPU | \
CFG_POST_RTC | \ CFG_POST_RTC | \
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
#else
#define CFG_CMD_POST_DIAG 0
#endif
#endif #endif
@ -175,9 +169,11 @@
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_IDE #define CONFIG_CMD_IDE
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_POST_DIAG
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options

View file

@ -167,12 +167,6 @@
#define CONFIG_POST (CFG_POST_CPU | \ #define CONFIG_POST (CFG_POST_CPU | \
CFG_POST_RTC | \ CFG_POST_RTC | \
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
#else
#define CFG_CMD_POST_DIAG 0
#endif
#endif #endif
@ -187,10 +181,12 @@
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_IDE #define CONFIG_CMD_IDE
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_POST_DIAG
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options

View file

@ -82,11 +82,8 @@
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
/* preserve space for the post_word at end of on-chip SRAM */ /* preserve space for the post_word at end of on-chip SRAM */
#define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
#else
#define CFG_CMD_POST_DIAG 0
#endif #endif
@ -95,10 +92,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#ifdef CONFIG_VIDEO
#define CONFIG_CMD_BMP
#endif
#define CONFIG_CMD_ASKENV #define CONFIG_CMD_ASKENV
#define CONFIG_CMD_DATE #define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
@ -112,12 +105,19 @@
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_POST_DIAG
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#define CONFIG_CMD_BSP #define CONFIG_CMD_BSP
#define CONFIG_CMD_USB #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 */ #define CONFIG_TIMESTAMP /* display image timestamps */

View file

@ -142,11 +142,8 @@
#endif #endif
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
/* preserve space for the post_word at end of on-chip SRAM */ /* preserve space for the post_word at end of on-chip SRAM */
#define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
#else
#define CFG_CMD_POST_DIAG 0
#endif #endif
@ -164,7 +161,6 @@
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_POST_DIAG
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#define CONFIG_CMD_BSP #define CONFIG_CMD_BSP
@ -188,6 +184,10 @@
#define CONFIG_CFG_FAT #define CONFIG_CFG_FAT
#endif #endif
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */

View file

@ -86,11 +86,8 @@
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
/* preserve space for the post_word at end of on-chip SRAM */ /* preserve space for the post_word at end of on-chip SRAM */
#define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
#else
#define CFG_CMD_POST_DIAG 0
#endif #endif
@ -109,10 +106,13 @@
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_POST
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */

View file

@ -144,11 +144,8 @@
#endif #endif
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
#define FLASH_START_POST_BLOCK 11 /* Should > = 11 */ #define FLASH_START_POST_BLOCK 11 /* Should > = 11 */
#define FLASH_END_POST_BLOCK 71 /* Should < = 71 */ #define FLASH_END_POST_BLOCK 71 /* Should < = 71 */
#else
#define CFG_CMD_POST_DIAG 0
#endif #endif
/* CF-CARD IDE-HDD Support */ /* CF-CARD IDE-HDD Support */
@ -197,7 +194,10 @@
#if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT) #if (BFIN_BOOT_MODE == BF537_BYPASS_BOOT)
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#define CONFIG_CMD_POST_DIAG
#if defined(CONFIG_POST)
#define CONFIG_CMD_DIAG
#endif
#ifdef CONFIG_BF537_NAND #ifdef CONFIG_BF537_NAND
#define CONFIG_CMD_NAND #define CONFIG_CMD_NAND

View file

@ -170,12 +170,6 @@
#define CONFIG_RTC_PCF8563 /* use Philips PCF8563 RTC */ #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. * Command line configuration.
@ -192,9 +186,12 @@
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#define CONFIG_CMD_IDE #define CONFIG_CMD_IDE
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_POST
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
#define CONFIG_MAC_PARTITION #define CONFIG_MAC_PARTITION
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION

View file

@ -60,11 +60,8 @@
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
/* preserve space for the post_word at end of on-chip SRAM */ /* preserve space for the post_word at end of on-chip SRAM */
#define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
#else
#define CFG_CMD_POST_DIAG 0
#endif #endif
@ -82,10 +79,13 @@
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_POST
#define CONFIG_CMD_REGINFO #define CONFIG_CMD_REGINFO
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */

View file

@ -116,11 +116,8 @@
CFG_POST_I2C) CFG_POST_I2C)
#ifdef CONFIG_POST #ifdef CONFIG_POST
#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
/* preserve space for the post_word at end of on-chip SRAM */ /* preserve space for the post_word at end of on-chip SRAM */
#define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4 #define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
#else
#define CFG_CMD_POST_DIAG 0
#endif #endif
@ -129,6 +126,18 @@
*/ */
#include <config_cmd_default.h> #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) #if defined(CONFIG_MINIFAP) || defined(CONFIG_STK52XX)
#define CONFIG_CMD_IDE #define CONFIG_CMD_IDE
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
@ -148,18 +157,9 @@
#define CONFIG_CMD_PCI #define CONFIG_CMD_PCI
#endif #endif
#define CONFIG_CMD_ASKENV #ifdef CONFIG_POST
#define CONFIG_CMD_DATE #define CONFIG_CMD_DIAG
#define CONFIG_CMD_DHCP #endif
#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
#define CONFIG_TIMESTAMP /* display image timestamps */ #define CONFIG_TIMESTAMP /* display image timestamps */

View file

@ -117,12 +117,6 @@
CFG_POST_SPR ) CFG_POST_SPR )
#undef CONFIG_POST #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. * Command line configuration.
@ -140,9 +134,12 @@
#define CONFIG_CMD_MII #define CONFIG_CMD_MII
#define CONFIG_CMD_NFS #define CONFIG_CMD_NFS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_POST
#define CONFIG_CMD_SNTP #define CONFIG_CMD_SNTP
#ifdef CONFIG_POST
#define CONFIG_CMD_DIAG
#endif
#define CONFIG_NETCONSOLE #define CONFIG_NETCONSOLE