diff mbox series

[v1,8/9] toradex: tdx-cfg-clock: fix i.mx 8m mini interactive

Message ID 20201028095816.23906-8-igor.opaniuk@gmail.com
State Accepted
Commit 2a1a2559fbc7f629fbf80a5478bcc252b9cd25b2
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>

Now with them first Verdin iMX8M Mini DualLite modules in for bring-up
we got clarity how is_cpu_type() actually behaves.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---

 board/toradex/common/tdx-cfg-block.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

Comments

Oleksandr Suvorov Oct. 29, 2020, 4:32 p.m. UTC | #1 
On Wed, Oct 28, 2020 at 11:59 AM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> Now with them first Verdin iMX8M Mini DualLite modules in for bring-up
> we got clarity how is_cpu_type() actually behaves.
>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

with a note: the commit message seems to have a typo s/them/the/, isn't it?

> ---
>
>  board/toradex/common/tdx-cfg-block.c | 26 +++++++++-----------------
>  1 file changed, 9 insertions(+), 17 deletions(-)
>
> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
> index 475abf78a7..adab0a0802 100644
> --- a/board/toradex/common/tdx-cfg-block.c
> +++ b/board/toradex/common/tdx-cfg-block.c
> @@ -423,12 +423,6 @@ 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_IMX8MM))
> -               tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
> -       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_IMX8MNQ_WIFI_BT;
>         else if (is_cpu_type(MXC_CPU_IMX8QM)) {
>                 if (it == 'y' || it == 'Y') {
>                         if (wb == 'y' || wb == 'Y')
> @@ -464,18 +458,16 @@ static int get_cfgblock_interactive(void)
>                                 tdx_hw_tag.prodid = COLIBRI_IMX8DX;
>                 }
>  #endif
> +       } else 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 (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;
> -               }
> +               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)) {
> --
> 2.17.1
>
Stefano Babic Dec. 8, 2020, 7:59 a.m. UTC | #2 
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Now with them first Verdin iMX8M Mini DualLite modules in for bring-up
> we got clarity how is_cpu_type() actually behaves.
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 475abf78a7..adab0a0802 100644
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -423,12 +423,6 @@  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_IMX8MM))
-		tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT;
-	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_IMX8MNQ_WIFI_BT;
 	else if (is_cpu_type(MXC_CPU_IMX8QM)) {
 		if (it == 'y' || it == 'Y') {
 			if (wb == 'y' || wb == 'Y')
@@ -464,18 +458,16 @@  static int get_cfgblock_interactive(void)
 				tdx_hw_tag.prodid = COLIBRI_IMX8DX;
 		}
 #endif
+	} else 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 (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;
-		}
+		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)) {