• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisiona2da29a4e2a0adac38dba2ebbb539ce52898d078 (tree)
Time2022-07-25 23:12:00
AuthorPhilippe Schenker <philippe.schenker@tora...>
CommiterStefano Babic

Log Message

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

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>

Change Summary

Incremental Difference

--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -145,6 +145,7 @@ const char * const toradex_modules[] = {
145145 [65] = "Verdin iMX8M Plus QuadLite 1GB IT",
146146 [66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT",
147147 [67] = "Apalis iMX8 QuadMax 8GB Wi-Fi / BT IT",
148+ [68] = "Verdin iMX8M Mini Quad 2GB WB IT No CAN",
148149 };
149150
150151 const char * const toradex_carrier_boards[] = {
@@ -408,6 +409,7 @@ static int get_cfgblock_interactive(void)
408409 char it = 'n';
409410 char wb = 'n';
410411 char mem8g = 'n';
412+ char can = 'y';
411413 int len = 0;
412414 int ret = 0;
413415
@@ -435,6 +437,13 @@ static int get_cfgblock_interactive(void)
435437 mem8g = console_buffer[0];
436438 }
437439 #endif
440+#if defined(CONFIG_TARGET_VERDIN_IMX8MM)
441+ if (is_cpu_type(MXC_CPU_IMX8MM) && (wb == 'y' || wb == 'Y')) {
442+ sprintf(message, "Does your module have CAN? [y/N] ");
443+ len = cli_readline(message);
444+ can = console_buffer[0];
445+ }
446+#endif
438447 #endif
439448
440449 soc = env_get("soc");
@@ -522,7 +531,9 @@ static int get_cfgblock_interactive(void)
522531 else
523532 tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
524533 } else if (is_cpu_type(MXC_CPU_IMX8MM)) {
525- if (wb == 'y' || wb == 'Y')
534+ if (can == 'n' || can == 'N')
535+ tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN;
536+ else if (wb == 'y' || wb == 'Y')
526537 tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
527538 else
528539 tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -88,6 +88,7 @@ enum {
8888 VERDIN_IMX8MPQL_IT, /* 65 */
8989 VERDIN_IMX8MPQ_8GB_WIFI_BT,
9090 APALIS_IMX8QM_8GB_WIFI_BT_IT,
91+ VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN,
9192 };
9293
9394 enum {
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -83,7 +83,8 @@ static void select_dt_from_module_version(void)
8383 * device tree.
8484 */
8585 is_wifi = (tdx_hw_tag.prodid == VERDIN_IMX8MMQ_WIFI_BT_IT) ||
86- (tdx_hw_tag.prodid == VERDIN_IMX8MMDL_WIFI_BT_IT);
86+ (tdx_hw_tag.prodid == VERDIN_IMX8MMDL_WIFI_BT_IT) ||
87+ (tdx_hw_tag.prodid == VERDIN_IMX8MMQ_WIFI_BT_IT_NO_CAN);
8788 }
8889
8990 switch (get_pcb_revision()) {