From 5e767185529c895f62c3216f27d8370e2bcabbce Mon Sep 17 00:00:00 2001 From: Ye Li Date: Thu, 23 Aug 2018 23:39:37 -0700 Subject: MLK-18901-1 imx8qm/qxp: Enable mtest command for ARM2 and MEK boards Enable the mtest command and add relevant configurations for tested memory range. Signed-off-by: Ye Li (cherry picked from commit 4bfe6f1e7527921d9f02dbd37eea8924dd6d3336) --- configs/imx8qm_ddr4_arm2_defconfig | 1 + configs/imx8qm_lpddr4_arm2_android_defconfig | 1 + configs/imx8qm_lpddr4_arm2_defconfig | 1 + configs/imx8qm_lpddr4_arm2_fspi_defconfig | 1 + configs/imx8qm_mek_android_defconfig | 1 + configs/imx8qm_mek_androidauto_defconfig | 1 + configs/imx8qm_mek_androidauto_xen_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qm_mek_fspi_defconfig | 1 + configs/imx8qxp_ddr3_arm2_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_android_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_fspi_defconfig | 1 + configs/imx8qxp_lpddr4_arm2_nand_defconfig | 1 + configs/imx8qxp_mek_android_defconfig | 1 + configs/imx8qxp_mek_androidauto_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/imx8qxp_mek_fspi_defconfig | 1 + include/configs/imx8qm_arm2.h | 3 +++ include/configs/imx8qm_mek.h | 3 +++ include/configs/imx8qxp_arm2.h | 3 +++ include/configs/imx8qxp_mek.h | 3 +++ 22 files changed, 30 insertions(+) diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig index 8e32b5c78a..f643679cbe 100644 --- a/configs/imx8qm_ddr4_arm2_defconfig +++ b/configs/imx8qm_ddr4_arm2_defconfig @@ -78,3 +78,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_android_defconfig b/configs/imx8qm_lpddr4_arm2_android_defconfig index d8887f4f24..cd1489b6aa 100644 --- a/configs/imx8qm_lpddr4_arm2_android_defconfig +++ b/configs/imx8qm_lpddr4_arm2_android_defconfig @@ -76,3 +76,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig index 695e5f8fe0..4811470e02 100644 --- a/configs/imx8qm_lpddr4_arm2_defconfig +++ b/configs/imx8qm_lpddr4_arm2_defconfig @@ -78,3 +78,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig index a2871d054a..a858680705 100644 --- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig @@ -79,3 +79,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig index 8f3b07e82f..db30330309 100644 --- a/configs/imx8qm_mek_android_defconfig +++ b/configs/imx8qm_mek_android_defconfig @@ -81,3 +81,4 @@ CONFIG_IMX_SC_THERMAL=y CONFIG_LZ4=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_androidauto_defconfig b/configs/imx8qm_mek_androidauto_defconfig index aa08667412..330e1f0729 100644 --- a/configs/imx8qm_mek_androidauto_defconfig +++ b/configs/imx8qm_mek_androidauto_defconfig @@ -101,3 +101,4 @@ CONFIG_IMX_SC_THERMAL=y CONFIG_LZ4=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_androidauto_xen_defconfig b/configs/imx8qm_mek_androidauto_xen_defconfig index 01b7a0a502..cd317321fe 100644 --- a/configs/imx8qm_mek_androidauto_xen_defconfig +++ b/configs/imx8qm_mek_androidauto_xen_defconfig @@ -104,3 +104,4 @@ CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_XEN_DEBUG_SERIAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 2a0d4cf791..cebc46ae07 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -79,3 +79,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig index b8a3c6c227..e13101f049 100644 --- a/configs/imx8qm_mek_fspi_defconfig +++ b/configs/imx8qm_mek_fspi_defconfig @@ -80,3 +80,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig index 6bc51d928a..31ef8df862 100644 --- a/configs/imx8qxp_ddr3_arm2_defconfig +++ b/configs/imx8qxp_ddr3_arm2_defconfig @@ -77,3 +77,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_android_defconfig b/configs/imx8qxp_lpddr4_arm2_android_defconfig index b1e6a26b2e..e398105305 100644 --- a/configs/imx8qxp_lpddr4_arm2_android_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_android_defconfig @@ -76,3 +76,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig index 04981087d2..4d850773d2 100644 --- a/configs/imx8qxp_lpddr4_arm2_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_defconfig @@ -77,3 +77,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig index 5b4f7c05c1..528848efea 100644 --- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig @@ -78,3 +78,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig index 4176c579cd..cb9859fb11 100644 --- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig +++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig @@ -76,3 +76,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig index 3e89377f10..bf8e24dd39 100644 --- a/configs/imx8qxp_mek_android_defconfig +++ b/configs/imx8qxp_mek_android_defconfig @@ -83,3 +83,4 @@ CONFIG_IMX_SC_THERMAL=y CONFIG_LZ4=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_androidauto_defconfig b/configs/imx8qxp_mek_androidauto_defconfig index c4cdce39bb..dceac7f8f2 100644 --- a/configs/imx8qxp_mek_androidauto_defconfig +++ b/configs/imx8qxp_mek_androidauto_defconfig @@ -103,3 +103,4 @@ CONFIG_IMX_SC_THERMAL=y CONFIG_LZ4=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index a818e0cc6b..0ae694eee8 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -93,3 +93,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig index 4909c58575..49ffa3508b 100644 --- a/configs/imx8qxp_mek_fspi_defconfig +++ b/configs/imx8qxp_mek_fspi_defconfig @@ -81,3 +81,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_SMC_FUSE=y +CONFIG_CMD_MEMTEST=y diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index 3fb7e720a1..61697da4c8 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -292,6 +292,9 @@ #define PHYS_SDRAM_2_SIZE 0x80000000 /* 2 GB */ #endif +#define CONFIG_SYS_MEMTEST_START 0xA0000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_1_SIZE >> 2)) + /* Serial */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index b87b1de1ba..d02da238ee 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -286,6 +286,9 @@ #define PHYS_SDRAM_1_SIZE 0x80000000 /* 2 GB */ #define PHYS_SDRAM_2_SIZE 0x100000000 /* 4 GB */ +#define CONFIG_SYS_MEMTEST_START 0xA0000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_1_SIZE >> 2)) + /* Serial */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index ef56702cb0..2790e4531e 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -290,6 +290,9 @@ #define PHYS_SDRAM_2_SIZE 0x40000000 /* 1 GB */ #endif +#define CONFIG_SYS_MEMTEST_START 0xA0000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_1_SIZE >> 2)) + /* Serial */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index a5da415607..e349997f23 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -304,6 +304,9 @@ /* LPDDR4 board total DDR is 3GB */ #define PHYS_SDRAM_2_SIZE 0x40000000 /* 1 GB */ +#define CONFIG_SYS_MEMTEST_START 0xA0000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_1_SIZE >> 2)) + /* Serial */ #define CONFIG_BAUDRATE 115200 -- cgit v1.2.3