Convert CONFIG_CMD_DIAG to Kconfig

This converts the following to Kconfig: CONFIG_CMD_DIAG Signed-off-by: Simon Glass <sjg@chromium.org> [trini: imply CMD_DIAG on some keymile configs] Signed-off-by: Tom Rini <trini@konsulko.com>
2024-06-09 23:36:03 +09:00 · 2017-04-26 22:28:08 -06:00 · 2017-04-26 22:28:08 -06:00 · 3bd25cb512
commit 3bd25cb512
parent 10c01337d3
81 changed files with 63 additions and 36 deletions
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@ -35,6 +35,7 @@ config TARGET_KM_KIRKWOOD
 	bool "KM_KIRKWOOD Board"
 	select BOARD_LATE_INIT
 	imply CMD_CRAMFS
+	imply CMD_DIAG
 	imply FS_CRAMFS

 config TARGET_NET2BIG_V2
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@ -65,6 +65,7 @@ config TARGET_IDS8313
 config TARGET_KM8360
 	bool "Support km8360"
 	imply CMD_CRAMFS
+	imply CMD_DIAG
 	imply FS_CRAMFS

 config TARGET_SUVD3
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@ -972,6 +972,14 @@ config CMD_BEDBUG
 	  for some PowerPC processors. For details please see the
 	  docuemntation in doc/README.beddbug

+config CMD_DIAG
+	bool "diag - Board diagnostics"
+	help
+	  This command provides access to board diagnostic tests. These are
+	  called Power-on Self Tests (POST). The command allows listing of
+	  available tests and running either all the tests, or specific tests
+	  identified by name.
+
 endmenu

 config CMD_UBI
--- a/configs/MiniFAP_defconfig
+++ b/configs/MiniFAP_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/TQM5200S_HIGHBOOT_defconfig
+++ b/configs/TQM5200S_HIGHBOOT_defconfig
@ -17,6 +17,7 @@ CONFIG_CMD_SNTP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/TQM5200S_defconfig
+++ b/configs/TQM5200S_defconfig
@ -17,6 +17,7 @@ CONFIG_CMD_SNTP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/TQM5200_B_HIGHBOOT_defconfig
+++ b/configs/TQM5200_B_HIGHBOOT_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/TQM5200_B_defconfig
+++ b/configs/TQM5200_B_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/TQM5200_STK100_defconfig
+++ b/configs/TQM5200_STK100_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/TQM5200_defconfig
+++ b/configs/TQM5200_defconfig
@ -20,6 +20,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/acadia_defconfig
+++ b/configs/acadia_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/amcore_defconfig
+++ b/configs/amcore_defconfig
@ -15,6 +15,7 @@ CONFIG_LOOPW=y
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_TIMER=y
+CONFIG_CMD_DIAG=y
 CONFIG_DM=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_DM_SERIAL=y
--- a/configs/bamboo_defconfig
+++ b/configs/bamboo_defconfig
@ -19,6 +19,7 @@ CONFIG_CMD_SNTP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/bubinga_defconfig
+++ b/configs/bubinga_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/charon_defconfig
+++ b/configs/charon_defconfig
@ -20,6 +20,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/cm5200_defconfig
+++ b/configs/cm5200_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@ -26,6 +26,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@ -28,6 +28,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_SF=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
--- a/configs/digsy_mtc_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_RAMBOOT_defconfig
@ -23,6 +23,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
--- a/configs/digsy_mtc_defconfig
+++ b/configs/digsy_mtc_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
--- a/configs/digsy_mtc_rev5_RAMBOOT_defconfig
+++ b/configs/digsy_mtc_rev5_RAMBOOT_defconfig
@ -23,6 +23,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
--- a/configs/digsy_mtc_rev5_defconfig
+++ b/configs/digsy_mtc_rev5_defconfig
@ -23,6 +23,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_USB=y
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@ -25,6 +25,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
+CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_SPI_FLASH=y
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@ -23,6 +23,7 @@ CONFIG_CMD_BMP=y
 CONFIG_CMD_BSP=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/gdppc440etx_defconfig
+++ b/configs/gdppc440etx_defconfig
@ -18,6 +18,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI_PNP is not set
--- a/configs/haleakala_defconfig
+++ b/configs/haleakala_defconfig
@ -18,6 +18,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/io64_defconfig
+++ b/configs/io64_defconfig
@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
--- a/configs/iocon_defconfig
+++ b/configs/iocon_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@ -21,6 +21,7 @@ CONFIG_CMD_ASKENV=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
--- a/configs/kilauea_defconfig
+++ b/configs/kilauea_defconfig
@ -18,6 +18,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 CONFIG_CMD_UBI=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
--- a/configs/legoev3_defconfig
+++ b/configs/legoev3_defconfig
@ -22,6 +22,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
--- a/configs/luan_defconfig
+++ b/configs/luan_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/lwmon5_defconfig
+++ b/configs/lwmon5_defconfig
@ -22,6 +22,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/makalu_defconfig
+++ b/configs/makalu_defconfig
@ -16,6 +16,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@ -20,15 +20,16 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
-CONFIG_CMD_UBI=y
 CONFIG_CMD_FS_GENERIC=y
-CONFIG_CMD_PART=y
+CONFIG_CMD_DIAG=y
+CONFIG_CMD_UBI=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000
 CONFIG_SPI_FLASH=y
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@ -45,6 +45,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_DIAG=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_MMC_OMAP_HS=y
--- a/configs/rainier_defconfig
+++ b/configs/rainier_defconfig
@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/rainier_ramboot_defconfig
+++ b/configs/rainier_ramboot_defconfig
@ -19,6 +19,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/redwood_defconfig
+++ b/configs/redwood_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 # CONFIG_PCI is not set
--- a/configs/sequoia_defconfig
+++ b/configs/sequoia_defconfig
@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/sequoia_ramboot_defconfig
+++ b/configs/sequoia_ramboot_defconfig
@ -20,6 +20,7 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/sycamore_defconfig
+++ b/configs/sycamore_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/v38b_defconfig
+++ b/configs/v38b_defconfig
@ -10,6 +10,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
--- a/configs/walnut_defconfig
+++ b/configs/walnut_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_SNTP=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/configs/xilinx-ppc405-generic_defconfig
+++ b/configs/xilinx-ppc405-generic_defconfig
@ -18,6 +18,7 @@ CONFIG_LOOPW=y
 # CONFIG_CMD_NET is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 CONFIG_OF_EMBED=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
--- a/configs/xilinx-ppc440-generic_defconfig
+++ b/configs/xilinx-ppc440-generic_defconfig
@ -17,6 +17,7 @@ CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 CONFIG_OF_EMBED=y
 CONFIG_NETCONSOLE=y
 # CONFIG_MMC is not set
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@ -10,6 +10,7 @@ CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_DIAG=y
 CONFIG_DM=y
 # CONFIG_DM_WARN is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
--- a/configs/yellowstone_defconfig
+++ b/configs/yellowstone_defconfig
@ -16,6 +16,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ISO_PARTITION=y
--- a/configs/yosemite_defconfig
+++ b/configs/yosemite_defconfig
@ -19,6 +19,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_DIAG=y
 CONFIG_MAC_PARTITION=y
 CONFIG_ISO_PARTITION=y
 # CONFIG_MMC is not set
--- a/configs/yucca_defconfig
+++ b/configs/yucca_defconfig
@ -15,6 +15,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_DIAG=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SYS_NS16550=y
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@ -14,7 +14,6 @@
 */

 #define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
-#define CONFIG_CMD_DIAG		/* Diagnostics			*/
 #define CONFIG_CMD_DISPLAY	/* Display support		*/
 #define CONFIG_CMD_DTT		/* Digital Therm and Thermostat */
 #define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@ -165,10 +165,6 @@
    #define CONFIG_CFG_FAT
 #endif

-#ifdef CONFIG_POST
-    #define CONFIG_CMD_DIAG
-#endif
-
 #define	CONFIG_TIMESTAMP		/* display image timestamps */

 #if (CONFIG_SYS_TEXT_BASE != 0xFFF00000)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@ -51,7 +51,6 @@
 */
 #if defined(CONFIG_440)
 #endif
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@ -30,8 +30,6 @@
 		"erase 0xfff00000 0xffffffff; "			\
 		"cp.b 0x20000 0xfff00000 ${filesize}\0"

-#define CONFIG_CMD_DIAG
-
 /* undef to save memory	*/
 #undef	CONFIG_SYS_LONGHELP

--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@ -301,7 +301,6 @@
 * U-Boot commands
 */
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES

 #ifndef CONFIG_DRIVER_TI_EMAC
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@ -22,7 +22,6 @@
 * Supported commands
 */
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO

--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@ -274,7 +274,6 @@
 * U-Boot commands
 */
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES

 #ifdef CONFIG_CMD_BDI
--- a/include/configs/digsy_mtc.h
+++ b/include/configs/digsy_mtc.h
@ -86,7 +86,6 @@
 * Command line configuration.
 */
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_IRQ
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@ -58,7 +58,6 @@
 * Commands additional to the ones defined in amcc-common.h
 */
 #define CONFIG_CMD_DTT
-#undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ

--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@ -56,7 +56,6 @@
 * Commands additional to the ones defined in amcc-common.h
 */
 #define CONFIG_CMD_DTT
-#undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ

--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@ -130,7 +130,6 @@
 * U-Boot commands
 */
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES

 #ifdef CONFIG_CMD_BDI
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@ -159,7 +159,6 @@
 /*
 * U-Boot commands
 */
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_NAND

--- a/include/configs/io.h
+++ b/include/configs/io.h
@ -58,7 +58,6 @@
 * Commands additional to the ones defined in amcc-common.h
 */
 #define CONFIG_CMD_DTT
-#undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ

--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@ -242,7 +242,6 @@
 * U-Boot commands
 */
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES

 #ifdef CONFIG_CMD_BDI
--- a/include/configs/km/km8309-common.h
+++ b/include/configs/km/km8309-common.h
@ -19,7 +19,6 @@
 #define CONFIG_MPC8309		1	/* MPC8309 CPU specific */

 #define CONFIG_KM_DEF_ARCH	"arch=ppc_82xx\0"
-#define CONFIG_CMD_DIAG		1

 /* include common defines/options for all 83xx Keymile boards */
 #include "km83xx-common.h"
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@ -310,7 +310,6 @@ int get_scl(void);
 #define CONFIG_POST	(CONFIG_SYS_POST_MEM_REGIONS)
 #define CONFIG_POST_SKIP_ENV_FLAGS
 #define CONFIG_POST_EXTERNAL_WORD_FUNCS
-#define CONFIG_CMD_DIAG

 /* we do the whole PCIe FPGA config stuff here */

--- a/include/configs/km8360.h
+++ b/include/configs/km8360.h
@ -270,7 +270,6 @@
 #define CPM_POST_WORD_ADDR  CONFIG_SYS_MEMTEST_END
 #define CONFIG_TESTPIN_REG  gprt3	/* for kmcoge5ne */
 #define CONFIG_TESTPIN_MASK 0x20	/* for kmcoge5ne */
-#define CONFIG_CMD_DIAG	/* so that testpin is inquired for POST test */

 #else
 #define CONFIG_SYS_IBAT6L	(0)
--- a/include/configs/legoev3.h
+++ b/include/configs/legoev3.h
@ -201,7 +201,6 @@
 /*
 * U-Boot commands
 */
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES

 #ifdef CONFIG_CMD_BDI
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@ -383,7 +383,6 @@
 * Command line configuration.
 */
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@ -58,7 +58,6 @@
 * Commands additional to the ones defined in amcc-common.h
 */
 #define CONFIG_CMD_DTT
-#undef CONFIG_CMD_DIAG
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ

--- a/include/configs/o2dnt-common.h
+++ b/include/configs/o2dnt-common.h
@ -72,9 +72,6 @@
 #ifdef CONFIG_PCI
 #define CONFIG_CMD_PCI
 #endif
-#ifdef CONFIG_POST
-#define CONFIG_CMD_DIAG
-#endif

 #if (CONFIG_SYS_TEXT_BASE == 0xFC000000) || (CONFIG_SYS_TEXT_BASE == 0xFF000000)
 /* Boot low with 16 or 32 MB Flash */
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@ -286,7 +286,6 @@
 * U-Boot commands
 */
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES
 #ifdef CONFIG_CMD_BDI
 #define CONFIG_CLOCKS
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@ -155,8 +155,6 @@

 #define CONFIG_CMD_MTDPARTS

-#define CONFIG_CMD_DIAG /* monitor functions : Diagnostics */
-
 #define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
 /* Size must be a multiple of Nand erase size (524288 b) */
 #define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:512k(SPL)," \
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@ -74,7 +74,6 @@
 * Command line configuration.
 */
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_SDRAM
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@ -24,7 +24,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)

 /*Cmd*/
-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_JFFS2
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@ -127,7 +127,6 @@
 /* U-Boot commands */
 /*=================*/

-#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_SAVES

 /*==============================*/
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -394,7 +394,6 @@ CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
 CONFIG_CMD_DATE
-CONFIG_CMD_DIAG
 CONFIG_CMD_DISPLAY
 CONFIG_CMD_DS4510
 CONFIG_CMD_DS4510_INFO