toradex: tdx-cfg-block: add new i.mx 6ull and 8m plus skus

Add new i.MX 6ULL and 8M Plus SKUs to ConfigBlock handling:

0062: Colibri iMX6ULL 1GB IT (eMMC)

0063: Verdin iMX8M Plus Quad 4GB IT

0064: Verdin iMX8M Plus Quad 2GB Wi-Fi / BT IT

0065: Verdin iMX8M Plus QuadLite 1GB IT

0066: Verdin iMX8M Plus Quad 8GB Wi-Fi / BT

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index ad267812267739999b7aebecda58ae56e3416458..7cadd05c0a780196e542f867dfdec9e6409d5aa9 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -145,6 +145,11 @@ const char * const toradex_modules[] = {
        [59] = "Verdin iMX8M Mini Quad 2GB IT",
        [60] = "Verdin iMX8M Mini DualLite 1GB WB IT",
        [61] = "Verdin iMX8M Plus Quad 2GB",
+       [62] = "Colibri iMX6ULL 1GB IT (eMMC)",
+       [63] = "Verdin iMX8M Plus Quad 4GB IT",
+       [64] = "Verdin iMX8M Plus Quad 2GB Wi-Fi / BT IT",
+       [65] = "Verdin iMX8M Plus QuadLite 1GB IT",
+       [66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT",
 };
 
 const char * const toradex_carrier_boards[] = {
@@ -415,7 +420,10 @@ static int get_cfgblock_interactive(void)
                        if (wb == 'y' || wb == 'Y')
                                tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT;
                        else
-                               tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT;
+                               if (gd->ram_size == 0x20000000)
+                                       tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT;
+                               else
+                                       tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT_EMMC;
                } else {
                        if (wb == 'y' || wb == 'Y')
                                tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT;
@@ -424,7 +432,10 @@ static int get_cfgblock_interactive(void)
                }
 #endif
        } else if (!strcmp("imx7d", soc))
-               tdx_hw_tag.prodid = COLIBRI_IMX7D;
+               if (gd->ram_size == 0x20000000)
+                       tdx_hw_tag.prodid = COLIBRI_IMX7D;
+               else
+                       tdx_hw_tag.prodid = COLIBRI_IMX7D_EMMC;
        else if (!strcmp("imx7s", soc))
                tdx_hw_tag.prodid = COLIBRI_IMX7S;
        else if (is_cpu_type(MXC_CPU_IMX8QM)) {
@@ -474,11 +485,21 @@ static int get_cfgblock_interactive(void)
                        tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;
        } else if (is_cpu_type(MXC_CPU_IMX8MN)) {
                tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
+       } else if (is_cpu_type(MXC_CPU_IMX8MPL)) {
+               tdx_hw_tag.prodid = VERDIN_IMX8MPQL_IT;
        } else if (is_cpu_type(MXC_CPU_IMX8MP)) {
                if (wb == 'y' || wb == 'Y')
-                       tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT;
+                       if (gd->ram_size == 0x80000000)
+                               tdx_hw_tag.prodid = VERDIN_IMX8MPQ_2GB_WIFI_BT_IT;
+                       else if (gd->ram_size == 0x200000000)
+                               tdx_hw_tag.prodid = VERDIN_IMX8MPQ_8GB_WIFI_BT;
+                       else
+                               tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT;
                else
-                       tdx_hw_tag.prodid = VERDIN_IMX8MPQ;
+                       if (it == 'y' || it == 'Y')
+                               tdx_hw_tag.prodid = VERDIN_IMX8MPQ_IT;
+                       else
+                               tdx_hw_tag.prodid = VERDIN_IMX8MPQ;
        } else if (!strcmp("tegra20", soc)) {
                if (it == 'y' || it == 'Y')
                        if (gd->ram_size == 0x10000000)

diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
index 9debd5f0462419669d56e4a7fb5c5ff8e603075f..ddcf6997480a1ef585f1b6eaa9341100dee869f7 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -82,6 +82,11 @@ enum {
        VERDIN_IMX8MMQ_IT,
        VERDIN_IMX8MMDL_WIFI_BT_IT, /* 60 */
        VERDIN_IMX8MPQ,
+       COLIBRI_IMX6ULL_IT_EMMC,
+       VERDIN_IMX8MPQ_IT,
+       VERDIN_IMX8MPQ_2GB_WIFI_BT_IT,
+       VERDIN_IMX8MPQL_IT, /* 65 */
+       VERDIN_IMX8MPQ_8GB_WIFI_BT,
 };
 
 enum {