diff mbox series

[v1,1/9] toradex: tdx-cfg-clock: add new i.mx 8m mini/plus skus

Message ID 20201028095816.23906-1-igor.opaniuk@gmail.com
State New
Delegated to: Stefano Babic
Headers show
Series [v1,1/9] toradex: tdx-cfg-clock: add new i.mx 8m mini/plus skus | expand

Commit Message

Igor Opaniuk Oct. 28, 2020, 9:58 a.m. UTC
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Add new i.MX 8M Mini/Plus SKUs to ConfigBlock handling:

0058: Verdin iMX8M Plus Quad 4GB Wi-Fi / BT IT

0059: Verdin iMX8M Mini Quad 2GB IT

0060: Verdin iMX8M Mini DualLite 1GB WB IT

0061: Verdin iMX8M Plus Quad 2GB

Rename existing SKU (use correct one):
Verdin iMX8M Nano SoloLite 1GB -> Verdin iMX8M Nano Quad 1GB Wi-Fi

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

 board/toradex/common/tdx-cfg-block.c | 42 ++++++++++++++++++++--------
 board/toradex/common/tdx-cfg-block.h |  8 ++++--
 2 files changed, 36 insertions(+), 14 deletions(-)

Comments

Marcel Ziswiler Oct. 29, 2020, 2:52 p.m. UTC | #1
And Igor, don't forget to drop:

# CONFIG_CMD_IMPORTENV is not set

And add:

CONFIG_OF_LIBFDT_OVERLAY=y

That way our regular distro boot scripts will work out-of-the-box. Thanks!

BTW: With such series a cover letter aka [PATCH 0/0] might make sense. Good oldé patman can do all of that and
more...

On Wed, 2020-10-28 at 11:58 +0200, Igor Opaniuk wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Add new i.MX 8M Mini/Plus SKUs to ConfigBlock handling:
> 
> 0058: Verdin iMX8M Plus Quad 4GB Wi-Fi / BT IT
> 
> 0059: Verdin iMX8M Mini Quad 2GB IT
> 
> 0060: Verdin iMX8M Mini DualLite 1GB WB IT
> 
> 0061: Verdin iMX8M Plus Quad 2GB
> 
> Rename existing SKU (use correct one):
> Verdin iMX8M Nano SoloLite 1GB -> Verdin iMX8M Nano Quad 1GB Wi-Fi
> 
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
> 
>  board/toradex/common/tdx-cfg-block.c | 42 ++++++++++++++++++++--------
>  board/toradex/common/tdx-cfg-block.h |  8 ++++--
>  2 files changed, 36 insertions(+), 14 deletions(-)
> 
> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
> index bf27b2fa66..475abf78a7 100644
> --- a/board/toradex/common/tdx-cfg-block.c
> +++ b/board/toradex/common/tdx-cfg-block.c
> @@ -16,7 +16,8 @@
>         defined(CONFIG_TARGET_COLIBRI_IMX6) || \
>         defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
>         defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
> -       defined(CONFIG_TARGET_VERDIN_IMX8MN)
> +       defined(CONFIG_TARGET_VERDIN_IMX8MN) || \
> +       defined(CONFIG_TARGET_VERDIN_IMX8MP)
>  #include <asm/arch/sys_proto.h>
>  #else
>  #define is_cpu_type(cpu) (0)
> @@ -137,8 +138,12 @@ const char * const toradex_modules[] = {
>         [53] = "Apalis iMX8 QuadXPlus 2GB ECC IT",
>         [54] = "Apalis iMX8 DualXPlus 1GB",
>         [55] = "Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT",
> -       [56] = "Verdin iMX8M Nano SoloLite 1GB", /* not currently on sale */
> +       [56] = "Verdin iMX8M Nano Quad 1GB Wi-Fi / BT", /* not currently on sale */
>         [57] = "Verdin iMX8M Mini DualLite 1GB",
> +       [58] = "Verdin iMX8M Plus Quad 4GB Wi-Fi / BT IT",
> +       [59] = "Verdin iMX8M Mini Quad 2GB IT",
> +       [60] = "Verdin iMX8M Mini DualLite 1GB WB IT",
> +       [61] = "Verdin iMX8M Plus Quad 2GB",
>  };
>  
>  const char * const toradex_carrier_boards[] = {
> @@ -361,21 +366,15 @@ static int get_cfgblock_interactive(void)
>  
>         if (cpu_is_pxa27x())
>                 sprintf(message, "Is the module the 312 MHz version? [y/N] ");
> -#if !defined(CONFIG_TARGET_VERDIN_IMX8MM) || !defined(CONFIG_TARGET_VERDIN_IMX8MN)
> -       else
> -               sprintf(message, "Is the module an IT version? [y/N] ");
> -
> -       len = cli_readline(message);
> -       it = console_buffer[0];
> -#else
>         else
>                 it = 'y';
> -#endif
>  
>  #if defined(CONFIG_TARGET_APALIS_IMX8) || \
>                 defined(CONFIG_TARGET_APALIS_IMX8X) || \
>                 defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \
> -               defined(CONFIG_TARGET_COLIBRI_IMX8X)
> +               defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
> +               defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
> +               defined(CONFIG_TARGET_VERDIN_IMX8MP)
>         sprintf(message, "Does the module have Wi-Fi / Bluetooth? [y/N] ");
>         len = cli_readline(message);
>         wb = console_buffer[0];
> @@ -429,7 +428,7 @@ static int get_cfgblock_interactive(void)
>         else if (is_cpu_type(MXC_CPU_IMX8MMDL))
>                 tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
>         else if (is_cpu_type(MXC_CPU_IMX8MN))
> -               tdx_hw_tag.prodid = VERDIN_IMX8MNSL;
> +               tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
>         else if (is_cpu_type(MXC_CPU_IMX8QM)) {
>                 if (it == 'y' || it == 'Y') {
>                         if (wb == 'y' || wb == 'Y')
> @@ -465,6 +464,25 @@ static int get_cfgblock_interactive(void)
>                                 tdx_hw_tag.prodid = COLIBRI_IMX8DX;
>                 }
>  #endif
> +       } else if (is_cpu_type(MXC_CPU_IMX8MM)) {
> +               if (is_cpu_type(MXC_CPU_IMX8MMDL)) {
> +                       if (wb == 'y' || wb == 'Y')
> +                               tdx_hw_tag.prodid = VERDIN_IMX8MMDL_WIFI_BT_IT;
> +                       else
> +                               tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
> +               } else {
> +                       if (wb == 'y' || wb == 'Y')
> +                               tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
> +                       else
> +                               tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;
> +               }
> +       } else if (is_cpu_type(MXC_CPU_IMX8MN)) {
> +               tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
> +       } else if (is_cpu_type(MXC_CPU_IMX8MP)) {
> +               if (wb == 'y' || wb == 'Y')
> +                       tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT;
> +               else
> +                       tdx_hw_tag.prodid = VERDIN_IMX8MPQ;
>         } 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 8f91d9aec6..9debd5f046 100644
> --- a/board/toradex/common/tdx-cfg-block.h
> +++ b/board/toradex/common/tdx-cfg-block.h
> @@ -75,9 +75,13 @@ enum {
>         COLIBRI_IMX8DX,
>         APALIS_IMX8QXP,
>         APALIS_IMX8DXP,
> -       VERDIN_IMX8MMQ_WIFI_BT_IT,
> -       VERDIN_IMX8MNSL,
> +       VERDIN_IMX8MMQ_WIFI_BT_IT, /* 55 */
> +       VERDIN_IMX8MNQ_WIFI_BT,
>         VERDIN_IMX8MMDL,
> +       VERDIN_IMX8MPQ_WIFI_BT_IT,
> +       VERDIN_IMX8MMQ_IT,
> +       VERDIN_IMX8MMDL_WIFI_BT_IT, /* 60 */
> +       VERDIN_IMX8MPQ,
>  };
>  
>  enum {
diff mbox series

Patch

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index bf27b2fa66..475abf78a7 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -16,7 +16,8 @@ 
 	defined(CONFIG_TARGET_COLIBRI_IMX6) || \
 	defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
 	defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
-	defined(CONFIG_TARGET_VERDIN_IMX8MN)
+	defined(CONFIG_TARGET_VERDIN_IMX8MN) || \
+	defined(CONFIG_TARGET_VERDIN_IMX8MP)
 #include <asm/arch/sys_proto.h>
 #else
 #define is_cpu_type(cpu) (0)
@@ -137,8 +138,12 @@  const char * const toradex_modules[] = {
 	[53] = "Apalis iMX8 QuadXPlus 2GB ECC IT",
 	[54] = "Apalis iMX8 DualXPlus 1GB",
 	[55] = "Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT",
-	[56] = "Verdin iMX8M Nano SoloLite 1GB", /* not currently on sale */
+	[56] = "Verdin iMX8M Nano Quad 1GB Wi-Fi / BT", /* not currently on sale */
 	[57] = "Verdin iMX8M Mini DualLite 1GB",
+	[58] = "Verdin iMX8M Plus Quad 4GB Wi-Fi / BT IT",
+	[59] = "Verdin iMX8M Mini Quad 2GB IT",
+	[60] = "Verdin iMX8M Mini DualLite 1GB WB IT",
+	[61] = "Verdin iMX8M Plus Quad 2GB",
 };
 
 const char * const toradex_carrier_boards[] = {
@@ -361,21 +366,15 @@  static int get_cfgblock_interactive(void)
 
 	if (cpu_is_pxa27x())
 		sprintf(message, "Is the module the 312 MHz version? [y/N] ");
-#if !defined(CONFIG_TARGET_VERDIN_IMX8MM) || !defined(CONFIG_TARGET_VERDIN_IMX8MN)
-	else
-		sprintf(message, "Is the module an IT version? [y/N] ");
-
-	len = cli_readline(message);
-	it = console_buffer[0];
-#else
 	else
 		it = 'y';
-#endif
 
 #if defined(CONFIG_TARGET_APALIS_IMX8) || \
 		defined(CONFIG_TARGET_APALIS_IMX8X) || \
 		defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \
-		defined(CONFIG_TARGET_COLIBRI_IMX8X)
+		defined(CONFIG_TARGET_COLIBRI_IMX8X) || \
+		defined(CONFIG_TARGET_VERDIN_IMX8MM) || \
+		defined(CONFIG_TARGET_VERDIN_IMX8MP)
 	sprintf(message, "Does the module have Wi-Fi / Bluetooth? [y/N] ");
 	len = cli_readline(message);
 	wb = console_buffer[0];
@@ -429,7 +428,7 @@  static int get_cfgblock_interactive(void)
 	else if (is_cpu_type(MXC_CPU_IMX8MMDL))
 		tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
 	else if (is_cpu_type(MXC_CPU_IMX8MN))
-		tdx_hw_tag.prodid = VERDIN_IMX8MNSL;
+		tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
 	else if (is_cpu_type(MXC_CPU_IMX8QM)) {
 		if (it == 'y' || it == 'Y') {
 			if (wb == 'y' || wb == 'Y')
@@ -465,6 +464,25 @@  static int get_cfgblock_interactive(void)
 				tdx_hw_tag.prodid = COLIBRI_IMX8DX;
 		}
 #endif
+	} else if (is_cpu_type(MXC_CPU_IMX8MM)) {
+		if (is_cpu_type(MXC_CPU_IMX8MMDL)) {
+			if (wb == 'y' || wb == 'Y')
+				tdx_hw_tag.prodid = VERDIN_IMX8MMDL_WIFI_BT_IT;
+			else
+				tdx_hw_tag.prodid = VERDIN_IMX8MMDL;
+		} else {
+			if (wb == 'y' || wb == 'Y')
+				tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
+			else
+				tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT;
+		}
+	} else if (is_cpu_type(MXC_CPU_IMX8MN)) {
+		tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT;
+	} else if (is_cpu_type(MXC_CPU_IMX8MP)) {
+		if (wb == 'y' || wb == 'Y')
+			tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT;
+		else
+			tdx_hw_tag.prodid = VERDIN_IMX8MPQ;
 	} 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 8f91d9aec6..9debd5f046 100644
--- a/board/toradex/common/tdx-cfg-block.h
+++ b/board/toradex/common/tdx-cfg-block.h
@@ -75,9 +75,13 @@  enum {
 	COLIBRI_IMX8DX,
 	APALIS_IMX8QXP,
 	APALIS_IMX8DXP,
-	VERDIN_IMX8MMQ_WIFI_BT_IT,
-	VERDIN_IMX8MNSL,
+	VERDIN_IMX8MMQ_WIFI_BT_IT, /* 55 */
+	VERDIN_IMX8MNQ_WIFI_BT,
 	VERDIN_IMX8MMDL,
+	VERDIN_IMX8MPQ_WIFI_BT_IT,
+	VERDIN_IMX8MMQ_IT,
+	VERDIN_IMX8MMDL_WIFI_BT_IT, /* 60 */
+	VERDIN_IMX8MPQ,
 };
 
 enum {