mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-13 18:56:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

toradex: configblock: generic wi-fi/bt handling

Browse Source 
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>
This commit is contained in:
Marcel Ziswiler 2019-07-12 12:35:06 +02:00 committed by Stefano Babic
parent 42a4f18255
commit d1aa1444e4
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
board/toradex/common/tdx-cfg-block.c
View File

@ -291,6 +291,7 @@ static int get_cfgblock_interactive(void)
char message[CONFIG_SYS_CBSIZE]; char message[CONFIG_SYS_CBSIZE];
char *soc; char *soc;
char it = 'n'; char it = 'n';
char wb = 'n';
int len; int len;
/* Unknown module by default */ /* 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] "); sprintf(message, "Is the module the 312 MHz version? [y/N] ");
else else
sprintf(message, "Is the module an IT version? [y/N] "); sprintf(message, "Is the module an IT version? [y/N] ");
len = cli_readline(message); len = cli_readline(message);
it = console_buffer[0]; 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"); soc = env_get("soc");
if (!strcmp("mx6", soc)) { if (!strcmp("mx6", soc)) {
#ifdef CONFIG_TARGET_APALIS_IMX6 #ifdef CONFIG_TARGET_APALIS_IMX6
@ -331,12 +339,6 @@ static int get_cfgblock_interactive(void)
tdx_hw_tag.prodid = COLIBRI_IMX6S; tdx_hw_tag.prodid = COLIBRI_IMX6S;
} }
#elif CONFIG_TARGET_COLIBRI_IMX6ULL #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 (it == 'y' || it == 'Y') {
if (wb == 'y' || wb == 'Y') if (wb == 'y' || wb == 'Y')
tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT; tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT;