diff mbox series

[U-Boot,2/5] toradex: configblock: generic wi-fi/bt handling

Message ID 20190709094046.10635-3-marcel@ziswiler.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series toradex: configblock: apalis-imx8 and colibri-imx8x fixes | expand

Commit Message

Marcel Ziswiler July 9, 2019, 9:40 a.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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>

---

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

Comments

Igor Opaniuk July 9, 2019, 10:03 a.m. UTC | #1 
On Tue, Jul 9, 2019 at 12:43 PM Marcel Ziswiler <marcel@ziswiler.com> wrote:
>
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> 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>
>
> ---
>
>  board/toradex/common/tdx-cfg-block.c | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
> index 67e0557f67..73f4a50567 100644
> --- 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,18 @@ 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 +340,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;
> --
> 2.21.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot

Reviewed-by: Igor Opaniuk <igor.opaniuk@toradex.com>
Oleksandr Suvorov July 9, 2019, 2:01 p.m. UTC | #2 
On Tue, 9 Jul 2019 at 12:43, Marcel Ziswiler <marcel@ziswiler.com> wrote:
>
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
>
> 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>
>
> ---
>
>  board/toradex/common/tdx-cfg-block.c | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
> index 67e0557f67..73f4a50567 100644
> --- 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,18 @@ 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 +340,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;
> --
> 2.21.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot

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

Patch

diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c
index 67e0557f67..73f4a50567 100644
--- 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,18 @@  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 +340,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;