From ac9771a867e83e37dd2049c5c9075058746f6a82 Mon Sep 17 00:00:00 2001 From: Oleksii Bidnichenko Date: Mon, 6 Sep 2021 15:19:37 +0300 Subject: cfgblock: extend get_cfgblock_interactive - Correct the hardware product id for the Colibri IMX7D (eMMC) module. - Exclude IT check since Colibri IMX7D (eMMC) is always IT. Related-to: ELB-4076 Signed-off-by: Oleksii Bidnichenko --- board/toradex/common/tdx-cfg-block.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 28689c298c..b210019106 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -371,7 +371,8 @@ static int get_cfgblock_interactive(void) if (cpu_is_pxa27x()) sprintf(message, "Is the module the 312 MHz version? [y/N] "); -#if !(defined(CONFIG_TARGET_VERDIN_IMX8MM) || defined(CONFIG_TARGET_VERDIN_IMX8MN) || defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC)) +#if !(defined(CONFIG_TARGET_VERDIN_IMX8MM) || defined(CONFIG_TARGET_VERDIN_IMX8MN) \ + || defined(CONFIG_TARGET_COLIBRI_IMX6ULL_EMMC) || defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)) else sprintf(message, "Is the module an IT version? [y/N] "); @@ -437,7 +438,11 @@ static int get_cfgblock_interactive(void) #endif #endif } else if (!strcmp("imx7d", soc)) +#if defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) + tdx_hw_tag.prodid = COLIBRI_IMX7D_EMMC; +#else tdx_hw_tag.prodid = COLIBRI_IMX7D; +#endif else if (!strcmp("imx7s", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7S; else if (is_cpu_type(MXC_CPU_IMX8MM)) -- cgit v1.2.3