dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-03 08:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

toradex: tdx-cfg-block: add 0068 i.mx 8m mini sku

Browse Source 
Add new i.MX 8M Mini SKU to ConfigBlock handling.

0068: Verdin iMX8M Mini Quad 2GB WB IT No CAN

This SKU is identical to 0055 but without CAN. Mention this in the name
so those modules can be distinguished.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
This commit is contained in:
Philippe Schenker
2022-07-21 15:17:31 +02:00
committed by Stefano Babic
parent 05996f350d
commit a2da29a4e2
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
board/toradex/common/tdx-cfg-block.c
View File

@@ -145,6 +145,7 @@ const char * const toradex_modules[] = {
[65] = "Verdin iMX8M Plus QuadLite 1GB IT", [65] = "Verdin iMX8M Plus QuadLite 1GB IT",
[66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT", [66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT",
[67] = "Apalis iMX8 QuadMax 8GB Wi-Fi / BT IT", [67] = "Apalis iMX8 QuadMax 8GB Wi-Fi / BT IT",
[68] = "Verdin iMX8M Mini Quad 2GB WB IT No CAN",
}; };
const char * const toradex_carrier_boards[] = { const char * const toradex_carrier_boards[] = {
@@ -408,6 +409,7 @@ static int get_cfgblock_interactive(void)
char it = 'n'; char it = 'n';
char wb = 'n'; char wb = 'n';
char mem8g = 'n'; char mem8g = 'n';
char can = 'y';
int len = 0; int len = 0;
int ret = 0; int ret = 0;
@@ -435,6 +437,13 @@ static int get_cfgblock_interactive(void)
mem8g = console_buffer[0]; mem8g = console_buffer[0];
} }
#endif #endif
#if defined(CONFIG_TARGET_VERDIN_IMX8MM)
if (is_cpu_type(MXC_CPU_IMX8MM) && (wb == 'y' || wb == 'Y')) {
sprintf(message, "Does your module have CAN? [y/N] ");
len = cli_readline(message);
can = console_buffer[0];
}
#endif
#endif #endif
soc = env_get("soc"); soc = env_get("soc");
@@ -522,7 +531,9 @@ static int get_cfgblock_interactive(void)
else else
tdx_hw_tag.prodid = VERDIN_IMX8MMDL; tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
} else if (is_cpu_type(MXC_CPU_IMX8MM)) { } else if (is_cpu_type(MXC_CPU_IMX8MM)) {
if (wb == 'y' || wb == 'Y') if (can == 'n' || can == 'N')
tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN;
else if (wb == 'y' || wb == 'Y')
tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT; tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
else else
tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT; tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;

1
board/toradex/common/tdx-cfg-block.h
View File

@@ -88,6 +88,7 @@ enum {
VERDIN_IMX8MPQL_IT, /* 65 */ VERDIN_IMX8MPQL_IT, /* 65 */
VERDIN_IMX8MPQ_8GB_WIFI_BT, VERDIN_IMX8MPQ_8GB_WIFI_BT,
APALIS_IMX8QM_8GB_WIFI_BT_IT, APALIS_IMX8QM_8GB_WIFI_BT_IT,
VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN,
}; };
enum { enum {

3
board/toradex/verdin-imx8mm/verdin-imx8mm.c
View File

@@ -83,7 +83,8 @@ static void select_dt_from_module_version(void)
* device tree. * device tree.
*/ */
is_wifi = (tdx_hw_tag.prodid == VERDIN_IMX8MMQ_WIFI_BT_IT) || is_wifi = (tdx_hw_tag.prodid == VERDIN_IMX8MMQ_WIFI_BT_IT) ||
(tdx_hw_tag.prodid == VERDIN_IMX8MMDL_WIFI_BT_IT); (tdx_hw_tag.prodid == VERDIN_IMX8MMDL_WIFI_BT_IT) ||
(tdx_hw_tag.prodid == VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN);
} }
switch (get_pcb_revision()) { switch (get_pcb_revision()) {