diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-09-11 14:50:50 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2019-09-18 17:16:10 +0200 |
| commit | 17cd4cb294d926f6e89174c42b09b3b15ee99afd (patch) | |
| tree | b76360774d91f10a205b9a15316f8e7f014facbf | |
| parent | 1a62ebf22608b6ecb4f99b84dcf22096c4d35b2d (diff) | |
tdx-cfg-block: add Apalis-iMX8X to get_cfgblock_interactive
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
| -rw-r--r-- | board/toradex/common/tdx-cfg-block.c | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 1fec008b82..905327bdb8 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -312,6 +312,8 @@ static int get_cfgblock_interactive(void) char *soc; char it = 'n'; char wb = 'n'; + char ac = 'A'; + char ecc = 'n'; int len; /* Unknown module by default */ @@ -325,6 +327,7 @@ static int get_cfgblock_interactive(void) it = console_buffer[0]; #if defined(CONFIG_TARGET_APALIS_IMX8) || \ + defined(CONFIG_TARGET_APALIS_IMX8QXP) || \ defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \ defined(CONFIG_TARGET_COLIBRI_IMX8X) sprintf(message, "Does the module have Wi-Fi / Bluetooth? " \ @@ -333,6 +336,19 @@ static int get_cfgblock_interactive(void) wb = console_buffer[0]; #endif +#if defined(CONFIG_TARGET_APALIS_IMX8QXP) || \ + defined(CONFIG_TARGET_COLIBRI_IMX8X) + sprintf(message, "Is the module family type Apalis (A) or Colibri (C)? " \ + "[A/C] "); + len = cli_readline(message); + ac = console_buffer[0]; + + sprintf(message, "Does the module have ECC ram installed? " \ + "[y/N] "); + len = cli_readline(message); + ecc = console_buffer[0]; +#endif + soc = env_get("soc"); if (!strcmp("mx6", soc)) { #ifdef CONFIG_TARGET_APALIS_IMX6 @@ -389,16 +405,28 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid = APALIS_IMX8QP; } } else if (is_cpu_type(MXC_CPU_IMX8QXP)) { - if (it == 'y' || it == 'Y') { - if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = COLIBRI_IMX8QXP_WIFI_BT_IT; + if (ac == 'c' || ac == 'C') { + if (it == 'y' || it == 'Y') { + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = COLIBRI_IMX8QXP_WIFI_BT_IT; + else + tdx_hw_tag.prodid = COLIBRI_IMX8QXP_IT; + } else { + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = COLIBRI_IMX8DX_WIFI_BT; + else + tdx_hw_tag.prodid = COLIBRI_IMX8DX; + } + } else if (wb == 'y' || wb == 'Y') { + if (ecc == 'y' || ecc == 'Y') + tdx_hw_tag.prodid = APALIS_IMX8QXP_ECC_WIFI_BT_IT_PROTOTYPE; else - tdx_hw_tag.prodid = COLIBRI_IMX8QXP_IT; + tdx_hw_tag.prodid = APALIS_IMX8QXP_WIFI_BT_IT; } else { - if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = COLIBRI_IMX8DX_WIFI_BT; + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = APALIS_IMX8QXP_ECC_IT; else - tdx_hw_tag.prodid = COLIBRI_IMX8DX; + tdx_hw_tag.prodid = APALIS_IMX8DXP; } } else if (!strcmp("tegra20", soc)) { if (it == 'y' || it == 'Y') |