[PATCH 1/2] toradex: tdx-cfg-block: add new 8gb apalis-imx8

[Marcel Ziswiler]

Hi Stefano

On Mon, 2022-05-09 at 18:58 +0200, Philippe Schenker wrote:
> From: Philippe Schenker <philippe.schenker at toradex.com>
> 
> 0067: Apalis iMX8 QuadMax 8GB Wi-Fi / BT IT
> 
> This module is identical to its 4GB counterpart
> 0037: Apalis iMX8 QuadMax 4GB Wi-Fi / BT IT
> except for the RAM size.
> 
> Signed-off-by: Philippe Schenker <philippe.schenker at toradex.com>
> Reviewed-by: Francesco Dolcini <francesco.dolcini at toradex.com>

Those two patches are currently still missing. Could you please apply them as well? Thanks!

Cheers

Marcel

> ---
> 
>  board/toradex/common/tdx-cfg-block.c | 18 ++++++++++++++++--
>  board/toradex/common/tdx-cfg-block.h |  1 +
>  2 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
> index 9c87289ae9..6c8cf4592d 100644
> --- a/board/toradex/common/tdx-cfg-block.c
> +++ b/board/toradex/common/tdx-cfg-block.c
> @@ -144,6 +144,7 @@ const char * const toradex_modules[] = {
>         [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",
> +       [67] = "Apalis iMX8 QuadMax 8GB Wi-Fi / BT IT",
>  };
>  
>  const char * const toradex_carrier_boards[] = {
> @@ -359,6 +360,7 @@ static int get_cfgblock_interactive(void)
>         char *soc;
>         char it = 'n';
>         char wb = 'n';
> +       char mem8g = 'n';
>         int len = 0;
>  
>         /* Unknown module by default */
> @@ -377,6 +379,14 @@ static int get_cfgblock_interactive(void)
>         sprintf(message, "Does the module have Wi-Fi / Bluetooth? [y/N] ");
>         len = cli_readline(message);
>         wb = console_buffer[0];
> +
> +#if defined(CONFIG_TARGET_APALIS_IMX8)
> +       if ((wb == 'y' || wb == 'Y') && (it == 'y' || it == 'Y')) {
> +               sprintf(message, "Does your module have 8GB of RAM? [y/N] ");
> +               len = cli_readline(message);
> +               mem8g = console_buffer[0];
> +       }
> +#endif
>  #endif
>  
>         soc = env_get("soc");
> @@ -430,8 +440,12 @@ static int get_cfgblock_interactive(void)
>                 tdx_hw_tag.prodid = COLIBRI_IMX7S;
>         else if (is_cpu_type(MXC_CPU_IMX8QM)) {
>                 if (it == 'y' || it == 'Y') {
> -                       if (wb == 'y' || wb == 'Y')
> -                               tdx_hw_tag.prodid = APALIS_IMX8QM_WIFI_BT_IT;
> +                       if (wb == 'y' || wb == 'Y') {
> +                               if (mem8g == 'y' || mem8g == 'Y')
> +                                       tdx_hw_tag.prodid = APALIS_IMX8QM_8GB_WIFI_BT_IT;
> +                               else
> +                                       tdx_hw_tag.prodid = APALIS_IMX8QM_WIFI_BT_IT;
> +                       }
>                         else
>                                 tdx_hw_tag.prodid = APALIS_IMX8QM_IT;
>                 } else {
> diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
> index ddcf699748..43e662e41d 100644
> --- a/board/toradex/common/tdx-cfg-block.h
> +++ b/board/toradex/common/tdx-cfg-block.h
> @@ -87,6 +87,7 @@ enum {
>         VERDIN_IMX8MPQ_2GB_WIFI_BT_IT,
>         VERDIN_IMX8MPQL_IT, /* 65 */
>         VERDIN_IMX8MPQ_8GB_WIFI_BT,
> +       APALIS_IMX8QM_8GB_WIFI_BT_IT,
>  };
>  
>  enum {