[U-Boot] [PATCH v1 3/5] board: toradex: tdx-cfg-block: clean-up sku handling

[Igor Opaniuk]

Reviewed-by: Igor Opaniuk <igor.opaniuk at toradex.com>

On Sat, Apr 6, 2019 at 2:47 PM Marcel Ziswiler <marcel at ziswiler.com> wrote:
>
> From: Marcel Ziswiler <marcel.ziswiler at toradex.com>
>
> Clean-up handling of several SKUs.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
>
> ---
>
>  board/toradex/common/tdx-cfg-block.c | 12 ++++++++----
>  board/toradex/common/tdx-cfg-block.h | 22 ++++++++++++----------
>  2 files changed, 20 insertions(+), 14 deletions(-)
>
> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
> index 71ff40cfad..7e529afc7f 100644
> --- a/board/toradex/common/tdx-cfg-block.c
> +++ b/board/toradex/common/tdx-cfg-block.c
> @@ -6,7 +6,9 @@
>  #include <common.h>
>  #include "tdx-cfg-block.h"
>
> -#if defined(CONFIG_TARGET_APALIS_IMX6) || defined(CONFIG_TARGET_COLIBRI_IMX6)
> +#if defined(CONFIG_TARGET_APALIS_IMX6) || \
> +       defined(CONFIG_TARGET_COLIBRI_IMX6) || \
> +       defined(CONFIG_TARGET_COLIBRI_IMX8QXP)
>  #include <asm/arch/sys_proto.h>
>  #else
>  #define is_cpu_type(cpu) (0)
> @@ -92,10 +94,10 @@ const char * const toradex_modules[] = {
>         [34] = "Apalis TK1 2GB",
>         [35] = "Apalis iMX6 Dual 1GB IT",
>         [36] = "Colibri iMX6ULL 256MB",
> -       [37] = "Apalis iMX8 QuadMax 4GB Wi-Fi / Bluetooth",
> -       [38] = "Colibri iMX8X",
> +       [37] = "Apalis iMX8 QuadMax 4GB Wi-Fi / BT IT",
> +       [38] = "Colibri iMX8 QuadXPlus 2GB Wi-Fi / BT IT",
>         [39] = "Colibri iMX7 Dual 1GB (eMMC)",
> -       [40] = "Colibri iMX6ULL 512MB Wi-Fi / Bluetooth IT",
> +       [40] = "Colibri iMX6ULL 512MB Wi-Fi / BT IT",
>         [41] = "Colibri iMX7 Dual 512MB EPDC",
>         [42] = "Apalis TK1 4GB",
>         [43] = "Colibri T20 512MB IT SETEK",
> @@ -340,6 +342,8 @@ static int get_cfgblock_interactive(void)
>                 tdx_hw_tag.prodid = COLIBRI_IMX7D;
>         else if (!strcmp("imx7s", soc))
>                 tdx_hw_tag.prodid = COLIBRI_IMX7S;
> +       else if (is_cpu_type(MXC_CPU_IMX8QXP))
> +               tdx_hw_tag.prodid = COLIBRI_IMX8QXP_WIFI_BT_IT;
>         else if (!strcmp("tegra20", soc)) {
>                 if (it == 'y' || it == 'Y')
>                         if (gd->ram_size == 0x10000000)
> diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h
> index 961bb4394f..b20b522e1d 100644
> --- a/board/toradex/common/tdx-cfg-block.h
> +++ b/board/toradex/common/tdx-cfg-block.h
> @@ -25,42 +25,44 @@ enum {
>         COLIBRI_PXA270_V1_520MHZ,
>         COLIBRI_PXA320,
>         COLIBRI_PXA300,
> -       COLIBRI_PXA310,
> +       COLIBRI_PXA310, /* 5 */
>         COLIBRI_PXA320_IT,
>         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_IMX6DL, /* 15 */
>         COLIBRI_IMX6S_IT,
>         COLIBRI_IMX6DL_IT,
> +       /* 18 */
> +       /* 19 */
>         COLIBRI_T20_256MB = 20,
>         COLIBRI_T20_512MB,
>         COLIBRI_T20_512MB_IT,
>         COLIBRI_T30,
>         COLIBRI_T20_256MB_IT,
> -       APALIS_T30_2GB,
> +       APALIS_T30_2GB, /* 25 */
>         APALIS_T30_1GB,
>         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,
> +       APALIS_IMX6D_IT, /* 35 */
>         COLIBRI_IMX6ULL,
> -       APALIS_IMX8QM, /* 37 */
> -       COLIBRI_IMX8X,
> +       APALIS_IMX8QM_WIFI_BT_IT,
> +       COLIBRI_IMX8QXP_WIFI_BT_IT,
>         COLIBRI_IMX7D_EMMC,
>         COLIBRI_IMX6ULL_WIFI_BT_IT, /* 40 */
>         COLIBRI_IMX7D_EPDC,
> -       APALIS_TK1_4GB,
> +       APALIS_TK1_4GB, /* not currently on sale */
>         COLIBRI_T20_512MB_IT_SETEK,
>         COLIBRI_IMX6ULL_IT,
>         COLIBRI_IMX6ULL_WIFI_BT, /* 45 */
> --
> 2.20.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot



-- 
Best regards - Freundliche Grüsse - Meilleures salutations

Senior Development Engineer,
Igor Opaniuk

Toradex AG
Altsagenstrasse 5 | 6048 Horw/Luzern | Switzerland | T: +41 41 500 48
00 (main line)