From patchwork Tue Apr 9 15:24:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082388 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 44drjJ6sdjz9sRd for ; Wed, 10 Apr 2019 01:26:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 82F1FC21DF9; Tue, 9 Apr 2019 15:24:59 +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 07AE6C21D74; Tue, 9 Apr 2019 15:24:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3148FC21DF9; Tue, 9 Apr 2019 15:24:34 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 1560EC21E36 for ; Tue, 9 Apr 2019 15:24:33 +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 0LoY3A-1ghGsu1XTO-00gY2O; Tue, 09 Apr 2019 17:24:30 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:24:09 +0200 Message-Id: <20190409152420.11394-4-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:yBT7xSDrg68PD9syzsa7lXD+Ld/ZLFK/1goFE/fT/6bUmqKagmk nxnkXoCGHZbzfYbuQhwyEfcFq4UL1/lN4omnKY9OtdiZJtStA7owiN1wILaRSC067WYvYRE O+SEqkWZNgaGjlFNP+gpftP4h0PcYdZWrThz8/EoBiB0sYGtYrtO3F5juAfrAyhMxx5S1NA T0uO0O02HgvKM2QiUdCOg== X-UI-Out-Filterresults: notjunk:1; V03:K0:r5ZWhux1ccg=:SSsuVZiJgfvCSfCBNeczAi 3DLAABnOyjuYa17p2uzCqNvCXdltCgJiVmwqQML5XOs7XfYX9e9K1DPAvZcZExm2zK4vZhqbf ge2R3Z9Aq4DBbOLqhZFDpgwG9k8QHct3cpdvVQwmhT549vs5ffO0HOU9bvLWeY/gZxfELjZ10 GdC807sK6JG+6Pzn+O7OvEKYhxhMT6CjmV6hNfkU63vPUEkXobR6M3eSwOo/mI6Aswf8Xws8t XzCAdQqa9Tv9oijAGHhc+xEtu6Wle0gaJGWbQvTsuZ9ZNlPGEF7EYJGdX0jfbNRRh/Jo3sPYb a6uo1xj4NKBUIMTHVSKZiwGTIboE1xXByzJ182W+BsAl9HBn2Be3SH0ssodB35oP0r+80BER+ BepQkMfrcxJ5ebL7IQewVKmGMtAYqtuzwH77Q9IkDjO2aw9ZjC084UKN8nGO+e7AABOdMGLwM d8rbyoAZCFBCwc/UK/tOVI3GMSvX//iMXghBFssEmDLEpeoavaJ3CVA6gqdWD8+a6Z+2fMdnU 6mGP1So/WZWrwtfxTsrlF8H2E9lcnNXDBu8cO0uRYzl2nDtFEFCX101WiSp5Lfhf/gvZpdZVK 5TIsXJfOc9YpOdaylkB7686emgssTshTKRbzpnlY1jySWSpmq9ISGIGqkJMQIZ4dd2xpm7uLC sI+cIzRWw6dc095+niw7fuXttUaRPeZ/hFe+0NAcM3nd9B2uNFktnslXiR44ze341IMCHCydg jYnI7tN0AA4Bffjj/2upMgKa/SGfV1XeH2WQxA== Cc: Marcel Ziswiler , Toradex ARM Support , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 03/14] colibri-imx6ull: set module variant depending on config block 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 Using CPU temperature grading as a discriminator if the Wi-Fi / Bluetooth chip is populated is no longer possible due to upcoming SKUs. Set variant to -wifi only if a valid config block is present and the product id mentions a SKU with Wi-Fi / Bluetooth. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v2: - Added Igor's reviewed-by. board/toradex/colibri-imx6ull/colibri-imx6ull.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/board/toradex/colibri-imx6ull/colibri-imx6ull.c b/board/toradex/colibri-imx6ull/colibri-imx6ull.c index fcb49a0718..fe60b8e870 100644 --- a/board/toradex/colibri-imx6ull/colibri-imx6ull.c +++ b/board/toradex/colibri-imx6ull/colibri-imx6ull.c @@ -29,6 +29,7 @@ #include #include #include "../common/tdx-common.h" +#include "../common/tdx-cfg-block.h" DECLARE_GLOBAL_DATA_PTR; @@ -317,10 +318,15 @@ static const struct boot_mode board_boot_modes[] = { int board_late_init(void) { - int minc, maxc; - - if (get_cpu_temp_grade(&minc, &maxc) != TEMP_COMMERCIAL) +#ifdef CONFIG_TDX_CFG_BLOCK + /* + * If we have a valid config block and it says we are a module with + * Wi-Fi/Bluetooth make sure we use the -wifi device tree. + */ + if (tdx_hw_tag.prodid == COLIBRI_IMX6ULL_WIFI_BT_IT || + tdx_hw_tag.prodid == COLIBRI_IMX6ULL_WIFI_BT) env_set("variant", "-wifi"); +#endif #ifdef CONFIG_CMD_BMODE add_board_boot_modes(board_boot_modes);