toradex: configblock: fix apalis imx8 target
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>
Fri, 12 Jul 2019 10:35:08 +0000 (12:35 +0200)
committerStefano Babic <sbabic@denx.de>
Fri, 19 Jul 2019 18:32:24 +0000 (20:32 +0200)
The Apalis iMX8 was missing the interactive part should a customer have
bricked his module and want to re-create the configuration block. Fix
this.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
board/toradex/common/tdx-cfg-block.c

index 9146cbac94f84cd17bc4a5dad21dc9f35d69a101..a7909d389887d233277562c521b1ebdbfc323bd4 100644 (file)
@@ -7,6 +7,7 @@
 #include "tdx-cfg-block.h"
 
 #if defined(CONFIG_TARGET_APALIS_IMX6) || \
+       defined(CONFIG_TARGET_APALIS_IMX8) || \
        defined(CONFIG_TARGET_COLIBRI_IMX6) || \
        defined(CONFIG_TARGET_COLIBRI_IMX8X)
 #include <asm/arch/sys_proto.h>
@@ -355,7 +356,19 @@ 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)) {
+       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;
+                       else
+                               tdx_hw_tag.prodid = APALIS_IMX8QM_IT;
+               } else {
+                       if (wb == 'y' || wb == 'Y')
+                               tdx_hw_tag.prodid = APALIS_IMX8QP_WIFI_BT;
+                       else
+                               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;