diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-08-03 19:05:42 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2017-08-31 19:57:38 -0700 |
| commit | 4e1c703ed18362d5f0f49a8ab8df86fb1f1ee9ef (patch) | |
| tree | 0f143e1c9602f749e5f27f4ab3f3fe78a6344d09 /board | |
| parent | 6bd94c8a9c9522fdd70bf65deb3431f63b3d2621 (diff) | |
tdx-cfg-block: add new sku's
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 13 | ||||
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.h | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index e2ceac0e69..3a8bd7f5bc 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -91,6 +91,11 @@ const char * const toradex_modules[] = { [33] = "Colibri iMX7 Dual 512MB", [34] = "Apalis TK1 2GB", [35] = "Apalis iMX6 Dual 1GB IT", + [36] = "Colibri iMX6ULL 256MB", + [37] = "Apalis iMX8", + [38] = "UNKNOWN MODULE", + [39] = "Colibri iMX7 Dual 1GB", + [40] = "Colibri iMX6ULL 512MB Wi-Fi / Bluetooth IT", }; #ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC @@ -295,13 +300,17 @@ static int get_cfgblock_interactive(void) if (it == 'y' || it == 'Y') if (is_cpu_type(MXC_CPU_MX6DL)) tdx_hw_tag.prodid = COLIBRI_IMX6DL_IT; - else + else if (is_cpu_type(MXC_CPU_MX6SOLO)) tdx_hw_tag.prodid = COLIBRI_IMX6S_IT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT; else if (is_cpu_type(MXC_CPU_MX6DL)) tdx_hw_tag.prodid = COLIBRI_IMX6DL; - else + else if (is_cpu_type(MXC_CPU_MX6SOLO)) tdx_hw_tag.prodid = COLIBRI_IMX6S; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL; #endif /* CONFIG_MACH_TYPE */ } else if (!strcmp("imx7d", soc)) { tdx_hw_tag.prodid = COLIBRI_IMX7D; diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index fd7c362cd7..e480312e90 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -31,14 +31,14 @@ enum { COLIBRI_PXA300_XT, COLIBRI_PXA270_312MHZ, COLIBRI_PXA270_520MHZ, - COLIBRI_VF50, /* not currently on sale */ - COLIBRI_VF61, + COLIBRI_VF50, /* 10 */ + COLIBRI_VF61, /* not currently on sale */ COLIBRI_VF61_IT, COLIBRI_VF50_IT, COLIBRI_IMX6S, COLIBRI_IMX6DL, COLIBRI_IMX6S_IT, - COLIBRI_IMX6DL_IT, + COLIBRI_IMX6DL_IT, /* 17 */ COLIBRI_T20_256MB = 20, COLIBRI_T20_512MB, COLIBRI_T20_512MB_IT, @@ -49,12 +49,16 @@ enum { APALIS_IMX6Q, APALIS_IMX6Q_IT, APALIS_IMX6D, - COLIBRI_T30_IT, + COLIBRI_T30_IT, /* 30 */ APALIS_T30_IT, COLIBRI_IMX7S, COLIBRI_IMX7D, APALIS_TK1_2GB, APALIS_IMX6D_IT, + COLIBRI_IMX6ULL, + APALIS_IMX8, /* 37 */ + COLIBRI_IMX7D_EMMC = 39, + COLIBRI_IMX6ULL_WIFI_BT_IT, /* 40 */ }; extern const char * const toradex_modules[]; |