From 9eea20302266639d28655fa557c6b2759fd5856f Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 23 Jan 2019 01:32:40 -0800 Subject: MLK-20794-2 imx8qxp_arm2: Add support for 17x17 validation boards There are two new validation boards: LPDDR4 board (30123) and DDR3L board (30010) for imx8x family 17x17 chips. These two boards have same design except the DDR. Since SCFW is resposible for DDR initialization, U-boot could use one build to cover two boards. The 8DX 17x17 DDR3L ARM2 has been added into u-boot before, so we rename the config CONFIG_TARGET_IMX8DX_DDR3_ARM2 to CONFIG_TARGET_IMX8X_17X17_VAL to cover DDR3L and LPDDR4. Considering 8DX and 8QXP 17x17 may solder to the boards, we create two defconfig: one for DX and another for 8qxp to share with the CONFIG_TARGET_IMX8X_17X17_VAL but with different FDTs. Signed-off-by: Ye Li --- board/freescale/imx8qxp_arm2/Kconfig | 2 +- board/freescale/imx8qxp_arm2/imx8qxp_arm2.c | 6 +++--- board/freescale/imx8qxp_arm2/spl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'board') diff --git a/board/freescale/imx8qxp_arm2/Kconfig b/board/freescale/imx8qxp_arm2/Kconfig index f4f15a12ed..abfb895fec 100644 --- a/board/freescale/imx8qxp_arm2/Kconfig +++ b/board/freescale/imx8qxp_arm2/Kconfig @@ -1,4 +1,4 @@ -if TARGET_IMX8QXP_LPDDR4_ARM2 || TARGET_IMX8QXP_DDR3_ARM2 || TARGET_IMX8DX_DDR3_ARM2 +if TARGET_IMX8QXP_LPDDR4_ARM2 || TARGET_IMX8QXP_DDR3_ARM2 || TARGET_IMX8X_17X17_VAL config SYS_BOARD default "imx8qxp_arm2" diff --git a/board/freescale/imx8qxp_arm2/imx8qxp_arm2.c b/board/freescale/imx8qxp_arm2/imx8qxp_arm2.c index e448001d7c..3ccf20de99 100644 --- a/board/freescale/imx8qxp_arm2/imx8qxp_arm2.c +++ b/board/freescale/imx8qxp_arm2/imx8qxp_arm2.c @@ -183,7 +183,7 @@ int board_early_init_f(void) #ifndef CONFIG_SPL_BUILD static struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC1_BASE_ADDR, 0, 8}, -#ifndef CONFIG_TARGET_IMX8DX_DDR3_ARM2 +#ifndef CONFIG_TARGET_IMX8X_17X17_VAL {USDHC2_BASE_ADDR, 0, 4}, #endif }; @@ -472,8 +472,8 @@ int checkboard(void) { #if defined(CONFIG_TARGET_IMX8QXP_DDR3_ARM2) puts("Board: iMX8QXP DDR3 ARM2\n"); -#elif defined(CONFIG_TARGET_IMX8DX_DDR3_ARM2) - puts("Board: iMX8DX DDR3 ARM2\n"); +#elif defined(CONFIG_TARGET_IMX8X_17X17_VAL) + puts("Board: iMX8X(QXP/DX) 17x17 Validation Board\n"); #else puts("Board: iMX8QXP LPDDR4 ARM2\n"); #endif diff --git a/board/freescale/imx8qxp_arm2/spl.c b/board/freescale/imx8qxp_arm2/spl.c index 2d64b33a0c..e9cb7eb532 100644 --- a/board/freescale/imx8qxp_arm2/spl.c +++ b/board/freescale/imx8qxp_arm2/spl.c @@ -65,7 +65,7 @@ DECLARE_GLOBAL_DATA_PTR; static struct fsl_esdhc_cfg usdhc_cfg[CONFIG_SYS_FSL_USDHC_NUM] = { {USDHC1_BASE_ADDR, 0, 8}, -#ifndef CONFIG_TARGET_IMX8DX_DDR3_ARM2 +#ifndef CONFIG_TARGET_IMX8X_17X17_VAL {USDHC2_BASE_ADDR, 0, 4}, #endif }; -- cgit v1.2.3