From patchwork Tue Apr 9 15:24:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082389 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44drjm3xQ6z9sSl for ; Wed, 10 Apr 2019 01:26:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0CE99C21E1D; Tue, 9 Apr 2019 15:25:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id AD1EFC21E1E; Tue, 9 Apr 2019 15:24:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 63B2EC21DF8; Tue, 9 Apr 2019 15:24:33 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 66C4EC21E2B for ; Tue, 9 Apr 2019 15:24:32 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MWRXY-1hPRLC3V4U-00Xe2O; Tue, 09 Apr 2019 17:24:29 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:08 +0200 Message-Id: <20190409152420.11394-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152420.11394-1-marcel@ziswiler.com> References: <20190409152420.11394-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:rrNtzfDXzjafb5ltB8Vb/QoQZAofh8Gbd1LLdiHEeNkFEvYL+mk Bph2V8x1WzVKVskGz1pcXv9YQ067uRz3vepQEkxjVmAPcr5b9phEkN9h19AYnVvXgzDDmUT 4sTm0fKXme734vZpmCMg2YfR1Ol//OVYNW8Y2O/w929AGZrEFieB4SIsq8K5onPXSPShQ9z 90w2Oe6ePOcyRmErjuHHA== X-UI-Out-Filterresults: notjunk:1; V03:K0:rslz8b7lCgY=:zfCmEtbYSEZXS+pEnk+o2L bQKXd0QC+ar94/EaP9RRSE3cxon9p5uEQYgQrMJzyY4l6RmaaTbCG3hHF+MCFk5TebRoI3miR 2778SeGWJyRb4LgVTGQkFD+of++PQUG8ISDCFDwJPsprk3jo6DEN7FgxuIMZHGfK4XeimwOq3 m58wgLLudF4rhtE1rep8e5ed15wP1QCQ3PyI1WClUtsnDBo+SEJjGwbhIClm1QrhJRiILE1J6 0rmyv5e6s5ytWX45voDZZnNpMLNjZHCnPsuX6m09TdeDXEBq26f7kUBFmNrEDtIlsd2GAG3TB H5Ef9TSLcOOYnYMZo/hInjHw5i9VmVDqin/BXSesrp/FvampmVGEYwnUXGlj8zMX3nisW4QZY kF72qSgk6/kw+HLfur5g4xzGVoj+UXy6MrfYYsm9G+WsvjoTO4J2a7hTVQCsiFDGAeste1tEb dnIRXgf2xLvWY035Ev0+pRWuac9cY7HraVnc840jt33jss5LZznbw5Xslr4/gu+qO80BKwicD 509kPmllJCJ+CDuX+toC5al1ftncZ/swEJNAFzyV/9wnuYDTr8XJ2n1bzIyL2gRRn/7hKGV4I WGwrbsw26fQayWoiC8n1B3dIqKj/9nJoY/e+iIPpKtNlh3BR8U46uBwM2C7ZpYfAP7ysiHvbo nC0/F0p71J2Gbx3+sUV2PhH3jhLTxD8fc7tqqxYTv16xI4RWBdNlpq6SJSu3UFoIIGafDhZ2E aAtD1KFERj0MCJaOtrPnCPmdwyyzc/QRthUcsg== Cc: Marcel Ziswiler , Gerard Salvatella , Igor Opaniuk , Dominik Sliwa , Stefan Agner Subject: [U-Boot] [PATCH v2 02/14] tdx-cfg-block: simplify i.MX 6 module detection X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Use CONFIG_TARGET_... at compile time to differentiate between Apalis iMX6, Colibri iMX6 and Colibri iMX6ULL. Avoid code duplication by moving question about Wi-Fi / Bluetooth before IT/non-IT decision. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v2: - Added Igor's reviewed-by. board/toradex/common/tdx-cfg-block.c | 68 ++++++++++++++-------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 3b73421243..71ff40cfad 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -280,6 +280,9 @@ static int get_cfgblock_interactive(void) char it = 'n'; int len; + /* Unknown module by default */ + tdx_hw_tag.prodid = 0; + if (cpu_is_pxa27x()) sprintf(message, "Is the module the 312 MHz version? [y/N] "); else @@ -290,54 +293,49 @@ static int get_cfgblock_interactive(void) soc = env_get("soc"); if (!strcmp("mx6", soc)) { -#ifdef CONFIG_MACH_TYPE - if (it == 'y' || it == 'Y') +#ifdef CONFIG_TARGET_APALIS_IMX6 + if (it == 'y' || it == 'Y') { if (is_cpu_type(MXC_CPU_MX6Q)) tdx_hw_tag.prodid = APALIS_IMX6Q_IT; else tdx_hw_tag.prodid = APALIS_IMX6D_IT; - else + } else { if (is_cpu_type(MXC_CPU_MX6Q)) tdx_hw_tag.prodid = APALIS_IMX6Q; else tdx_hw_tag.prodid = APALIS_IMX6D; -#else - char wb = 'n'; - + } +#elif CONFIG_TARGET_COLIBRI_IMX6 if (it == 'y' || it == 'Y') { - if (is_cpu_type(MXC_CPU_MX6DL)) { + if (is_cpu_type(MXC_CPU_MX6DL)) tdx_hw_tag.prodid = COLIBRI_IMX6DL_IT; - } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { + else if (is_cpu_type(MXC_CPU_MX6SOLO)) tdx_hw_tag.prodid = COLIBRI_IMX6S_IT; - } else { - sprintf(message, "Does the module have WiFi /" \ - " Bluetooth? [y/N] "); - len = cli_readline(message); - wb = console_buffer[0]; - if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = - COLIBRI_IMX6ULL_WIFI_BT_IT; - else - tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; - } } else { - if (is_cpu_type(MXC_CPU_MX6DL)) { + if (is_cpu_type(MXC_CPU_MX6DL)) tdx_hw_tag.prodid = COLIBRI_IMX6DL; - } else if (is_cpu_type(MXC_CPU_MX6SOLO)) { + else if (is_cpu_type(MXC_CPU_MX6SOLO)) tdx_hw_tag.prodid = COLIBRI_IMX6S; - } else { - sprintf(message, "Does the module have WiFi /" \ - " Bluetooth? [y/N] "); - len = cli_readline(message); - wb = console_buffer[0]; - if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = - COLIBRI_IMX6ULL_WIFI_BT; - else - tdx_hw_tag.prodid = COLIBRI_IMX6ULL; - } } -#endif /* CONFIG_MACH_TYPE */ +#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; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; + } else { + if (wb == 'y' || wb == 'Y') + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL; + } +#endif } else if (!strcmp("imx7d", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7D; else if (!strcmp("imx7s", soc)) @@ -389,7 +387,9 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid = COLIBRI_VF61_IT; else tdx_hw_tag.prodid = COLIBRI_VF61; - } else { + } + + if (!tdx_hw_tag.prodid) { printf("Module type not detectable due to unknown SoC\n"); return -1; }