aboutsummaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/B4860QDS.h1
-rw-r--r--include/configs/MigoR.h1
-rw-r--r--include/configs/P2041RDB.h1
-rw-r--r--include/configs/T102xQDS.h1
-rw-r--r--include/configs/T102xRDB.h1
-rw-r--r--include/configs/T1040QDS.h1
-rw-r--r--include/configs/T104xRDB.h1
-rw-r--r--include/configs/T208xRDB.h1
-rw-r--r--include/configs/T4240RDB.h1
-rw-r--r--include/configs/ap121.h1
-rw-r--r--include/configs/ap143.h1
-rw-r--r--include/configs/ap325rxa.h1
-rw-r--r--include/configs/ap_sh4a_4a.h1
-rw-r--r--include/configs/apalis_imx6.h1
-rw-r--r--include/configs/armadillo-800eva.h1
-rwxr-xr-xinclude/configs/blanche.h1
-rw-r--r--include/configs/clearfog.h2
-rw-r--r--include/configs/colibri_imx6.h1
-rw-r--r--include/configs/controlcenterdc.h2
-rw-r--r--include/configs/corenet_ds.h1
-rw-r--r--include/configs/cyrus.h1
-rw-r--r--include/configs/db-88f6720.h2
-rw-r--r--include/configs/db-88f6820-amc.h2
-rw-r--r--include/configs/db-88f6820-gp.h2
-rw-r--r--include/configs/db-mv784mp-gp.h2
-rw-r--r--include/configs/ds414.h2
-rw-r--r--include/configs/ecovec.h1
-rw-r--r--include/configs/el6x_common.h2
-rw-r--r--include/configs/km/keymile-common.h2
-rw-r--r--include/configs/kzm9g.h1
-rw-r--r--include/configs/ls1012a2g5rdb.h2
-rw-r--r--include/configs/ls1012afrdm.h2
-rw-r--r--include/configs/ls1012aqds.h2
-rw-r--r--include/configs/ls1012ardb.h2
-rw-r--r--include/configs/ls1088aqds.h1
-rw-r--r--include/configs/ls1088ardb.h1
-rw-r--r--include/configs/maxbcm.h2
-rw-r--r--include/configs/ms7722se.h1
-rw-r--r--include/configs/mv-plug-common.h2
-rw-r--r--include/configs/mvebu_armada-37xx.h2
-rw-r--r--include/configs/mvebu_armada-8k.h2
-rw-r--r--include/configs/mx7ulp_evk.h1
-rw-r--r--include/configs/nitrogen6x.h2
-rw-r--r--include/configs/qemu-ppce500.h1
-rw-r--r--include/configs/r0p7734.h1
-rw-r--r--include/configs/s32v234evb.h1
-rw-r--r--include/configs/sh7752evb.h1
-rw-r--r--include/configs/sh7753evb.h1
-rw-r--r--include/configs/sh7757lcr.h1
-rw-r--r--include/configs/sh7785lcr.h1
-rw-r--r--include/configs/strider.h2
-rw-r--r--include/configs/t4qds.h1
-rw-r--r--include/configs/tao3530.h1
-rw-r--r--include/configs/theadorable.h1
-rw-r--r--include/configs/topic_miami.h1
-rw-r--r--include/configs/tplink_wdr4300.h1
-rw-r--r--include/configs/tricorder.h1
-rw-r--r--include/configs/turris_omnia.h2
-rw-r--r--include/configs/wb50n.h1
-rw-r--r--include/configs/xilinx_zynqmp.h1
-rw-r--r--include/configs/xpedite517x.h1
-rw-r--r--include/configs/xpedite520x.h1
-rw-r--r--include/configs/xpedite537x.h1
-rw-r--r--include/configs/xpedite550x.h1
64 files changed, 0 insertions, 84 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index d339c1a939e..6b85bb435a2 100644
--- 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
diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 84c364ce533..4b880e18331 100644
--- 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
diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 0b5cde6dcf0..91a894e9f32 100644
--- 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
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index cd980bcb12f..3c5c5067c72 100644
--- 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
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 378ed188ede..334d76106bd 100644
--- 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
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 68805108ac1..12b42ec0662 100644
--- 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
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index a45bf40f1fa..87425ec4db4 100644
--- 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
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 03d933b9547..2eae2790406 100644
--- 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
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 35e96b21565..e69a80cbbca 100644
--- 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
diff --git a/include/configs/ap121.h b/include/configs/ap121.h
index e1a192d8f39..247f44bbad3 100644
--- 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 */
diff --git a/include/configs/ap143.h b/include/configs/ap143.h
index 94b5332147d..00588ab5ed4 100644
--- 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 */
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index b7498262232..098bafe5929 100644
--- 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
diff --git a/include/configs/ap_sh4a_4a.h b/include/configs/ap_sh4a_4a.h
index d46a588a8d4..6df2ff98224 100644
--- 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
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 9e5a7e52701..9beeb4ae8da 100644
--- 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
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 9aca91a18e6..6e7ac0a9055 100644
--- 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
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 506b783d34e..8c1959d264c 100755
--- 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
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 7089bc4f157..fd2659b5922 100644
--- 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" \
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 72db44dd6bb..f13b54a1fd2 100644
--- 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
diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index e34b08ed982..14a0b1b0bd9 100644
--- 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
*/
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index d325bc9201a..fdadec95066 100644
--- 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
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index c3b58455323..4a5c25b558e 100644
--- 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
diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index 25ce0ce4d3e..b1296d3c13f 100644
--- 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
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h
index f039f0b34fe..e6c040cb525 100644
--- 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" \
diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index db7346a1b14..ec500e7c839 100644
--- 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" \
diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index 115b5936684..5dc0a45983b 100644
--- 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
diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index ce520b23dea..a47cd6431a2 100644
--- 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
diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h
index 991cee57f09..35eaec6a469 100644
--- 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
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 94e0bdf924b..2dac12f6077 100644
--- 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
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 61890d3621e..cf3fc438df9 100644
--- 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
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 82984f4d17e..179c7603f26 100644
--- 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
diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h
index dbb0fcc62b5..57e42b95c14 100644
--- 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
diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 7c080a0cd38..6bb6927039d 100644
--- 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
diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index e1767efa35a..d5515c10225 100644
--- 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
diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 442c95eb141..50e7a940143 100644
--- 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
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 34f991caa55..bcd9d5a1e52 100644
--- 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
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 3f2a00820a3..23158253985 100644
--- 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
diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 45931459012..d4c7b064941 100644
--- 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
diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 5ba10b86484..687f8ff1ef9 100644
--- 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 */
diff --git a/include/configs/mv-plug-common.h b/include/configs/mv-plug-common.h
index a2f68ad70ae..f6ac035549e 100644
--- 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 */
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 52f8c5d711a..ad5a449653c 100644
--- 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)
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 1cd0fa93d34..f69166302d3 100644
--- 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)
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 9c58c294891..ab7b30b1edd 100644
--- 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 \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c73cfb7f7e0..7d2cf0bd8c9 100644
--- 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
*/
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index ca4b6ec5921..df18d84087d 100644
--- 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 */
diff --git a/include/configs/r0p7734.h b/include/configs/r0p7734.h
index c14b4d26488..c5cb657afb4 100644
--- 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
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 4dc098b828f..e820aa9f0de 100644
--- 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)
diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 9d5950937e6..e192de0623f 100644
--- 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
diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h
index fee8059651f..c17bc310bbb 100644
--- 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
diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index c750666052b..6ca13aa5f84 100644
--- 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
diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index b175a6f69d9..8d362623381 100644
--- 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
diff --git a/include/configs/strider.h b/include/configs/strider.h
index f8f4f0f13c7..9bb820c75a5 100644
--- 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
*/
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index faea33978f4..33d451f2ab2 100644
--- 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
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 8038c9f859c..6e04e6b5092 100644
--- 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 */
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index e4ec2c00f86..433ee14e2f5 100644
--- 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 */
diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index 9e8409ba57d..38be08632f6 100644
--- 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
diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h
index 15b4ada3dc5..ad90beed974 100644
--- 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
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 87eb9ac281e..9e7fadb2fa2 100644
--- 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 */
diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 94a3be63fe3..9ca47f46ccb 100644
--- 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" \
diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h
index c61865f0b22..df27523e780 100644
--- 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
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 8c0b5d9c06a..ce5f77e3677 100644
--- 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
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 5c8342eee7a..78140cdc16f 100644
--- 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 |\
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index b159d91b073..4bc583cca0d 100644
--- 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 | \
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 9f4a9203c07..a4566b8384d 100644
--- 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 | \
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 3627aed8163..499a1dbd410 100644
--- 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 | \