diff options
| author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-03-24 16:05:52 +0200 |
|---|---|---|
| committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-03-24 16:10:07 +0200 |
| commit | 8c8b56a5a9be3e558a6e76789a0d527d1170736d (patch) | |
| tree | df8208d3f7e837f0935d67857aa247eb5e6f7d39 | |
| parent | 4653dcf81b930bff4430dc20e183f4c1225f71da (diff) | |
tdx-cfg-block: add proper defines for other Verdin SKUs
1. Add support for these two modules:
Verdin iMX8M Nano SoloLite 1GB
Verdin iMX8M Mini DualLite 1GB
2. Rename VERDIN_IMX8MM define to VERDIN_IMX8MMQ_WIFI_BT_IT
Relates-to: ELB-2602
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 13 | ||||
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.h | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 2c83db8e97..e8c2b20e03 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -11,7 +11,8 @@ defined(CONFIG_TARGET_APALIS_IMX8QXP) || \ defined(CONFIG_TARGET_COLIBRI_IMX6) || \ defined(CONFIG_TARGET_COLIBRI_IMX8QXP) || \ - defined(CONFIG_TARGET_VERDIN_IMX8MM) + defined(CONFIG_TARGET_VERDIN_IMX8MM) || \ + defined(CONFIG_TARGET_VERDIN_IMX8MN) #include <asm/arch/sys_proto.h> #else #define is_cpu_type(cpu) (0) @@ -116,6 +117,8 @@ const char * const toradex_modules[] = { [53] = "Apalis iMX8 QuadXPlus 2GB ECC IT", [54] = "Apalis iMX8 DualXPlus 1GB", [55] = "Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT", + [56] = "Verdin iMX8M Nano SoloLite 1GB", /* not currently on sale */ + [57] = "Verdin iMX8M Mini DualLite 1GB", }; const char * const toradex_prototype_modules[] = { @@ -324,7 +327,7 @@ 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) +#if !defined(CONFIG_TARGET_VERDIN_IMX8MM) || !defined(CONFIG_TARGET_VERDIN_IMX8MN) else { sprintf(message, "Is the module an IT version? [y/N] "); } @@ -403,7 +406,11 @@ static int get_cfgblock_interactive(void) else if (!strcmp("imx7s", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7S; else if (is_cpu_type(MXC_CPU_IMX8MM)) - tdx_hw_tag.prodid = VERDIN_IMX8MM; + tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT; + else if (is_cpu_type(MXC_CPU_IMX8MMDL)) + tdx_hw_tag.prodid = VERDIN_IMX8MMDL; + else if (is_cpu_type(MXC_CPU_IMX8MN)) + tdx_hw_tag.prodid = VERDIN_IMX8MNSL; else if (is_cpu_type(MXC_CPU_IMX8QM)) { if (it == 'y' || it == 'Y') { if (wb == 'y' || wb == 'Y') diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index cb93916c16..7a7ecdbe76 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -75,7 +75,9 @@ enum { COLIBRI_IMX8DX, APALIS_IMX8QXP_ECC_IT, APALIS_IMX8DXP, - VERDIN_IMX8MM, + VERDIN_IMX8MMQ_WIFI_BT_IT, + VERDIN_IMX8MNSL, + VERDIN_IMX8MMDL, /* Prototypes */ APALIS_IMX8QXP_ECC_WIFI_BT_IT_PROTOTYPE = 2600, }; |