treewide: Migrate CONFIG_SYS_ALT_MEMTEST to Kconfig

Migrate the CONFIG_SYS_ALT_MEMTEST option to Kconfig. Signed-off-by: Mario Six <mario.six@gdsys.cc> [trini: Re-run migration after also including CMD_MEMTEST] Signed-off-by: Tom Rini <trini@konsulko.com>
2018-03-28 14:38:14 +02:00
parent c9542eae0b
commit e89f8aae3d
132 changed files with 74 additions and 88 deletions
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -167,7 +167,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

 /* Enable alternate, more extensive, memory test */
-#undef  CONFIG_SYS_ALT_MEMTEST
 /* Scratch address used by the alternate memory test */
 #undef  CONFIG_SYS_MEMTEST_SCRATCH

--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -111,7 +111,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_POST CONFIG_SYS_POST_MEMORY	/* test POST memory test */
 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -189,7 +189,6 @@ unsigned long get_board_ddr_clk(void);

 #define CONFIG_SYS_MEMTEST_START	0x00200000 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -212,7 +212,6 @@ unsigned long get_board_ddr_clk(void);

 #define CONFIG_SYS_MEMTEST_START	0x00200000 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -122,7 +122,6 @@ unsigned long get_board_ddr_clk(void);

 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -219,7 +219,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg

 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -111,7 +111,6 @@

 #define CONFIG_SYS_MEMTEST_START	0x00200000 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 #ifdef CONFIG_MTD_NOR_FLASH
 #define CONFIG_FLASH_CFI_DRIVER
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -89,7 +89,6 @@

 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/ap121.h
+++ b/include/configs/ap121.h
@@ -43,6 +43,5 @@
 */
 #define CONFIG_SYS_MEMTEST_START        0x80100000
 #define CONFIG_SYS_MEMTEST_END          0x83f00000
-#define CONFIG_CMD_MEMTEST

 #endif  /* __CONFIG_H */
--- a/include/configs/ap143.h
+++ b/include/configs/ap143.h
@@ -47,6 +47,5 @@
 */
 #define CONFIG_SYS_MEMTEST_START        0x80100000
 #define CONFIG_SYS_MEMTEST_END          0x83f00000
-#define CONFIG_CMD_MEMTEST

 #endif  /* __CONFIG_H */
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -37,7 +37,6 @@
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

 /* Enable alternate, more extensive, memory test */
-#undef  CONFIG_SYS_ALT_MEMTEST
 /* Scratch address used by the alternate memory test */
 #undef  CONFIG_SYS_MEMTEST_SCRATCH

--- a/include/configs/ap_sh4a_4a.h
+++ b/include/configs/ap_sh4a_4a.h
@@ -44,7 +44,6 @@
 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END	 (CONFIG_SYS_MEMTEST_START + CONFIG_SYS_SDRAM_SIZE)
 /* Enable alternate, more extensive, memory test */
-#undef  CONFIG_SYS_ALT_MEMTEST
 /* Scratch address used by the alternate memory test */
 #undef  CONFIG_SYS_MEMTEST_SCRATCH

--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -253,7 +253,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS		48

-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH	0x10800000
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -47,7 +47,6 @@
 #define CONFIG_SYS_MEMTEST_START	(ARMADILLO_800EVA_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					 504 * 1024 * 1024)
-#undef	CONFIG_SYS_ALT_MEMTEST
 #undef	CONFIG_SYS_MEMTEST_SCRATCH
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -32,7 +32,6 @@
 #define CONFIG_SYS_MEMTEST_START	(RCAR_GEN2_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 504 * 1024 * 1024)

-#undef	CONFIG_SYS_ALT_MEMTEST
 #undef	CONFIG_SYS_MEMTEST_SCRATCH
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -66,8 +66,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define RELOCATION_LIMITS_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -228,7 +228,6 @@
 #undef CONFIG_SYS_MAXARGS
 #define CONFIG_SYS_MAXARGS		48

-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x10010000
 #define CONFIG_SYS_MEMTEST_SCRATCH	0x10800000
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -73,8 +73,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif

-#define CONFIG_SYS_ALT_MEMTEST
-
 /*
 * Software (bit-bang) MII driver configuration
 */
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -123,7 +123,6 @@
 #define CONFIG_POST CONFIG_SYS_POST_MEMORY	/* test POST memory test */
 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -82,7 +82,6 @@
 #undef CONFIG_POST
 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -46,8 +46,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */

-#define CONFIG_SYS_ALT_MEMTEST
-
 /*
 * mv-common.h should be defined after CMD configs since it used them
 * to enable certain macros
--- a/include/configs/db-88f6820-amc.h
+++ b/include/configs/db-88f6820-amc.h
@@ -51,8 +51,6 @@
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
 #define CONFIG_SYS_NAND_ONFI_DETECTION

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -66,8 +66,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -44,8 +44,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* SATA support */
 #define CONFIG_SYS_SATA_MAX_DEVICE	2
 #define CONFIG_LBA48
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -42,8 +42,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define CONFIG_SYS_NETA_INTERFACE_TYPE	PHY_INTERFACE_MODE_RGMII

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* PCIe support */
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_PCI_MVEBU
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -79,7 +79,6 @@
 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END	 (CONFIG_SYS_MEMTEST_START + 200 * 1024 * 1024)
 /* Enable alternate, more extensive, memory test */
-#undef  CONFIG_SYS_ALT_MEMTEST
 /* Scratch address used by the alternate memory test */
 #undef  CONFIG_SYS_MEMTEST_SCRATCH

--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -82,8 +82,6 @@

 #define CONFIG_ARP_TIMEOUT     200UL

-#define CONFIG_CMD_MEMTEST
-
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         0x10800000
 #define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -23,8 +23,6 @@

 #define CONFIG_HUSH_INIT_VAR

-#define CONFIG_SYS_ALT_MEMTEST		/* memory test, takes time */
-
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }

 #define CONFIG_LOADS_ECHO
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -47,7 +47,6 @@
 #define CONFIG_SYS_MEMTEST_START	(KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \
 	(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))
-#undef  CONFIG_SYS_ALT_MEMTEST
 #undef  CONFIG_SYS_MEMTEST_SCRATCH
 #undef  CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/ls1012a2g5rdb.h
+++ b/include/configs/ls1012a2g5rdb.h
@@ -15,7 +15,6 @@
 #define CONFIG_NR_DRAM_BANKS		2
 #define CONFIG_SYS_SDRAM_SIZE		0x40000000
 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

@@ -39,7 +38,6 @@
 #define CONFIG_NET_MULTI

 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_SDRAM_SIZE		0x20000000
 #define CONFIG_CHIP_SELECTS_PER_CTRL	1
 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

@@ -71,7 +70,6 @@
 #define CONFIG_BOOTCOMMAND "pfe stop;run distro_bootcmd;run qspi_bootcmd"

 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -15,7 +15,6 @@
 #define CONFIG_NR_DRAM_BANKS		2
 #define CONFIG_SYS_SDRAM_SIZE		0x40000000
 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

@@ -118,7 +117,6 @@
 #define CONFIG_PCI_SCAN_SHOW

 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -15,7 +15,6 @@
 #define CONFIG_NR_DRAM_BANKS		2
 #define CONFIG_SYS_SDRAM_SIZE		0x40000000
 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

@@ -56,7 +55,6 @@
 #define CONFIG_PCI_SCAN_SHOW

 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -348,7 +348,6 @@ unsigned long get_board_ddr_clk(void);
 #endif

 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -292,7 +292,6 @@
 #endif

 #define CONFIG_CMD_MEMINFO
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x80000000
 #define CONFIG_SYS_MEMTEST_END		0x9fffffff

--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -42,8 +42,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */

-#define CONFIG_SYS_ALT_MEMTEST
-
 /*
 * mv-common.h should be defined after CMD configs since it used them
 * to enable certain macros
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -32,7 +32,6 @@
 #define CONFIG_SYS_MEMTEST_START	(MS7722SE_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (60 * 1024 * 1024))

-#undef  CONFIG_SYS_ALT_MEMTEST		/* Enable alternate, more extensive, memory test */
 #undef  CONFIG_SYS_MEMTEST_SCRATCH	/* Scratch address used by the alternate memory test */

 #undef  CONFIG_SYS_LOADS_BAUD_CHANGE	/* Enable temporary baudrate change while serial download */
--- a/include/configs/mv-plug-common.h
+++ b/include/configs/mv-plug-common.h
@@ -45,6 +45,4 @@
 #define CONFIG_RTC_MV
 #endif /* CONFIG_CMD_DATE */

-#define CONFIG_SYS_ALT_MEMTEST
-
 #endif /* _CONFIG_MARVELL_PLUG_H */
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -49,8 +49,6 @@
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS	32	/* max number of command args */

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* End of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)

--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -51,8 +51,6 @@
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000	/* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS	32	/* max number of command args */

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* End of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)

--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -85,7 +85,6 @@

 #define CONFIG_LOADADDR             0x60800000

-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_END      0x9E000000

 #define CONFIG_EXTRA_ENV_SETTINGS \
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -268,8 +268,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
 #endif

-#define CONFIG_SYS_ALT_MEMTEST
-
 /*
 * PCI express
 */
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -27,7 +27,6 @@

 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /* Needed to fill the ccsrbar pointer */

--- a/include/configs/r0p7734.h
+++ b/include/configs/r0p7734.h
@@ -42,7 +42,6 @@
 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END	 (CONFIG_SYS_MEMTEST_START + 100 * 1024 * 1024)
 /* Enable alternate, more extensive, memory test */
-#undef  CONFIG_SYS_ALT_MEMTEST
 /* Scratch address used by the alternate memory test */
 #undef  CONFIG_SYS_MEMTEST_SCRATCH

--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -156,7 +156,6 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"=> "

-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	(DDR_BASE_ADDR)
 #define CONFIG_SYS_MEMTEST_END		(DDR_BASE_ADDR + 0x7C00000)

--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MEMTEST_START	(SH7752EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					 480 * 1024 * 1024)
-#undef	CONFIG_SYS_ALT_MEMTEST
 #undef	CONFIG_SYS_MEMTEST_SCRATCH
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/sh7753evb.h
+++ b/include/configs/sh7753evb.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MEMTEST_START	(SH7753EVB_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					 480 * 1024 * 1024)
-#undef	CONFIG_SYS_ALT_MEMTEST
 #undef	CONFIG_SYS_MEMTEST_SCRATCH
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_MEMTEST_START	(SH7757LCR_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					 224 * 1024 * 1024)
-#undef	CONFIG_SYS_ALT_MEMTEST
 #undef	CONFIG_SYS_MEMTEST_SCRATCH
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -47,7 +47,6 @@
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + \
 					(SH7785LCR_SDRAM_SIZE) - \
 					 4 * 1024 * 1024)
-#undef	CONFIG_SYS_ALT_MEMTEST
 #undef	CONFIG_SYS_MEMTEST_SCRATCH
 #undef	CONFIG_SYS_LOADS_BAUD_CHANGE

--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -24,8 +24,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC83xx_ESDHC_ADDR

-#define CONFIG_SYS_ALT_MEMTEST
-
 /*
 * System Clock Setup
 */
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -49,7 +49,6 @@

 #define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00400000
-#define CONFIG_SYS_ALT_MEMTEST

 /*
 *  Config the L3 Cache as L3 SRAM
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -139,7 +139,6 @@

 /* turn on command-line edit/hist/auto */

-#define CONFIG_SYS_ALT_MEMTEST		1
 #define CONFIG_SYS_MEMTEST_START	(0x82000000)		/* memtest */
 								/* defaults */
 #define CONFIG_SYS_MEMTEST_END		(0x83FFFFFF)		/* 64MB */
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -54,7 +54,6 @@
 #define CONFIG_PHY_MARVELL		/* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT	8000	/* PHY needs a longer aneg time */

-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_PREBOOT

 /* Keep device tree and initrd in lower memory so the kernel can access them */
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -43,7 +43,6 @@
 /* FPGA commands that we don't use */

 /* Extras */
-#define CONFIG_CMD_MEMTEST
 #undef CONFIG_SYS_MEMTEST_START
 #define CONFIG_SYS_MEMTEST_START	0
 #undef CONFIG_SYS_MEMTEST_END
--- a/include/configs/tplink_wdr4300.h
+++ b/include/configs/tplink_wdr4300.h
@@ -57,7 +57,6 @@
 */
 #define CONFIG_SYS_MEMTEST_START	0x80100000
 #define CONFIG_SYS_MEMTEST_END		0x83f00000
-#define CONFIG_CMD_MEMTEST

 #define CONFIG_CMD_MII

--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -264,6 +264,5 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x100000	/* 1 MB */

-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_SCRATCH	0x81000000
 #endif /* __CONFIG_H */
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -75,8 +75,6 @@
 #define CONFIG_PCI_SCAN_SHOW
 #endif

-#define CONFIG_SYS_ALT_MEMTEST
-
 /* Keep device tree and initrd in lower memory so the kernel can access them */
 #define RELOCATION_LIMITS_ENV_SETTINGS	\
 	"fdt_high=0x10000000\0"		\
--- a/include/configs/wb50n.h
+++ b/include/configs/wb50n.h
@@ -53,7 +53,6 @@

 #define CONFIG_SYS_MEMTEST_START    0x21000000
 #define CONFIG_SYS_MEMTEST_END      0x22000000
-#define CONFIG_SYS_ALT_MEMTEST

 /* NAND flash */
 #define CONFIG_NAND_ATMEL
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -20,7 +20,6 @@
 #define GICD_BASE	0xF9010000
 #define GICC_BASE	0xF9020000

-#define CONFIG_SYS_ALT_MEMTEST
 #ifndef CONFIG_SYS_MEMTEST_SCRATCH
 # define CONFIG_SYS_MEMTEST_SCRATCH	0x10800000
 #endif
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -79,7 +79,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
 * Diagnostics
 */
-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x20000000
 #define CONFIG_POST			(CONFIG_SYS_POST_MEMORY |\
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -55,7 +55,6 @@
 /*
 * Diagnostics
 */
-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x20000000
 #define CONFIG_POST			(CONFIG_SYS_POST_MEMORY | \
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -72,7 +72,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
 * Diagnostics
 */
-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x20000000
 #define CONFIG_POST			(CONFIG_SYS_POST_MEMORY | \
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -70,7 +70,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
 * Diagnostics
 */
-#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x10000000
 #define CONFIG_SYS_MEMTEST_END		0x20000000
 #define CONFIG_POST			(CONFIG_SYS_POST_MEMORY | \