toradex: configblock: generic wi-fi/bt handling

Make the interactive Wi-Fi/BT handling generic by pulling it out of the
Colibri iMX6ULL interactive part to be re-used for Apalis iMX8 and
Colibri iMX8X.

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>

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 67e0557f678143d85422c467000f23fd5c3742ce..451f8d4c119342eb4570b2e14eccd79aeb2a2fec 100644 (file)
--- a/board/toradex/common/tdx-cfg-block.c
+++ b/board/toradex/common/tdx-cfg-block.c
@@ -291,6 +291,7 @@ static int get_cfgblock_interactive(void)
        char message[CONFIG_SYS_CBSIZE];
        char *soc;
        char it = 'n';
+       char wb = 'n';
        int len;
 
        /* Unknown module by default */
@@ -300,10 +301,17 @@ static int get_cfgblock_interactive(void)
                sprintf(message, "Is the module the 312 MHz version? [y/N] ");
        else
                sprintf(message, "Is the module an IT version? [y/N] ");
-
        len = cli_readline(message);
        it = console_buffer[0];
 
+#if defined(CONFIG_TARGET_APALIS_IMX8) || \
+               defined(CONFIG_TARGET_COLIBRI_IMX6ULL) || \
+               defined(CONFIG_TARGET_COLIBRI_IMX8X)
+       sprintf(message, "Does the module have Wi-Fi / Bluetooth? [y/N] ");
+       len = cli_readline(message);
+       wb = console_buffer[0];
+#endif
+
        soc = env_get("soc");
        if (!strcmp("mx6", soc)) {
 #ifdef CONFIG_TARGET_APALIS_IMX6
@@ -331,12 +339,6 @@ static int get_cfgblock_interactive(void)
                                tdx_hw_tag.prodid = COLIBRI_IMX6S;
                }
 #elif CONFIG_TARGET_COLIBRI_IMX6ULL
-               char wb = 'n';
-
-               sprintf(message, "Does the module have Wi-Fi / Bluetooth? " \
-                                "[y/N] ");
-               len = cli_readline(message);
-               wb = console_buffer[0];
                if (it == 'y' || it == 'Y') {
                        if (wb == 'y' || wb == 'Y')
                                tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT;