From patchwork Tue Apr 9 15:25:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1082406 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 44drtR1t0mz9sRd for ; Wed, 10 Apr 2019 01:34:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AC043C21E08; Tue, 9 Apr 2019 15:28:21 +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 3716FC21E12; Tue, 9 Apr 2019 15:28:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 25FECC21DFB; Tue, 9 Apr 2019 15:25:55 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 58633C21DE8 for ; Tue, 9 Apr 2019 15:25:51 +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 0M88Kl-1h0rww3UIL-00vjQL; Tue, 09 Apr 2019 17:25:48 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 17:25:32 +0200 Message-Id: <20190409152534.11691-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409152534.11691-1-marcel@ziswiler.com> References: <20190409152534.11691-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:p5WNa3zVAMbV2AFTZkm2+MT0uf8L/BoPDDkMwDHA3BHy0Z2azRL gwQBDJoJdNO0FRoF/4EOH7/zqmB4MptgO0sqawgfhmE/pnKszXHrSIKpvM9PZ7BOQAuT3hj pk/3WO5qAaN2Mo+u8oifHAFf9uElVwlHFQwDlixX2vgVcTVT3VipAMcqEKDNCB08vFA1EJR Kmxg3S/9395otOWRPwfZg== X-UI-Out-Filterresults: notjunk:1; V03:K0:EdMWPeln0+U=:3uKhrU+XUWeymfh1vmXfdD g6U/txgQczLh7b/FcohDJRLorAcDk+Dwx8A3ZTBzySkK515KnPljXBJxhwd783h6ZpRXzv7Mv aq87d3kepViR7X5so3jHz03xt6lzoE/8u4vYfTAjQOQiJnj8bdaHFU3XZ6NdRvLpM7xAt5SDi /V0kEK1laxYYf78gpTXc3a20H2dBDJKn4CMaet2BRu8xcu6rQO7RSrfaTU29f2wZ+n6itMNVK Qr0YXZqp5xknfxRC5kHdjF+V0ytp62UQA4X7MvDSI/xYgShvfrfMA6HUuPtq0gVGFNcnV/UFn JqD4hCU7VNXSu3jyrgDdHRu8x4u0Z/EOVQhx5BFMiIsQ/eVzSlDcy04isut7HtcaOyDtguLct MxFc6Wd2kvcj1K2tpYo7ob8oDKKr35oHnZoDmqbSjR/fbCjEfQa9dTMf7TY5eFB4ji9k7HUXt UJh+ULVtM6X0RFOXmb/wGjksoxR1eRMsWrN5Ob1w8hRTQ9ZGNkgy4lskP/u4XYcR1kf2wMnWE Rf5Bc/sM3EkRzcwOSgLvJUhY2DLgHOVfd3iJyjZphL8pLTBY69iKVFJMJn2QttVt8x9udhvZS KCO6fpuTR9hSt0HFDgdi2MF2qyiLIAVMmFhEp4Wt+FWns+0fXVOFUE2+T3ldER/sa2+ux7w2I yOLbs1R/p+mZxVhf8RL5DqCX4CtYSJNZk7Q16PiueWjytkrQanGjx0SF6O4s/REWJYCo+WQV7 TGxotfkxaTGWSxStnmE7R1ET+McHcp4jsQow0g== Cc: Marcel Ziswiler , Gerard Salvatella , Igor Opaniuk , Stefan Agner , Dominik Sliwa Subject: [U-Boot] [PATCH v2 3/5] board: toradex: tdx-cfg-block: clean-up sku handling 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: Marcel Ziswiler Clean-up handling of several SKUs. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v2: - Added Igor's reviewed-by. board/toradex/common/tdx-cfg-block.c | 12 ++++++++---- board/toradex/common/tdx-cfg-block.h | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 71ff40cfad..7e529afc7f 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -6,7 +6,9 @@ #include #include "tdx-cfg-block.h" -#if defined(CONFIG_TARGET_APALIS_IMX6) || defined(CONFIG_TARGET_COLIBRI_IMX6) +#if defined(CONFIG_TARGET_APALIS_IMX6) || \ + defined(CONFIG_TARGET_COLIBRI_IMX6) || \ + defined(CONFIG_TARGET_COLIBRI_IMX8QXP) #include #else #define is_cpu_type(cpu) (0) @@ -92,10 +94,10 @@ const char * const toradex_modules[] = { [34] = "Apalis TK1 2GB", [35] = "Apalis iMX6 Dual 1GB IT", [36] = "Colibri iMX6ULL 256MB", - [37] = "Apalis iMX8 QuadMax 4GB Wi-Fi / Bluetooth", - [38] = "Colibri iMX8X", + [37] = "Apalis iMX8 QuadMax 4GB Wi-Fi / BT IT", + [38] = "Colibri iMX8 QuadXPlus 2GB Wi-Fi / BT IT", [39] = "Colibri iMX7 Dual 1GB (eMMC)", - [40] = "Colibri iMX6ULL 512MB Wi-Fi / Bluetooth IT", + [40] = "Colibri iMX6ULL 512MB Wi-Fi / BT IT", [41] = "Colibri iMX7 Dual 512MB EPDC", [42] = "Apalis TK1 4GB", [43] = "Colibri T20 512MB IT SETEK", @@ -340,6 +342,8 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid = COLIBRI_IMX7D; else if (!strcmp("imx7s", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7S; + else if (is_cpu_type(MXC_CPU_IMX8QXP)) + tdx_hw_tag.prodid = COLIBRI_IMX8QXP_WIFI_BT_IT; else if (!strcmp("tegra20", soc)) { if (it == 'y' || it == 'Y') if (gd->ram_size == 0x10000000) diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index 961bb4394f..b20b522e1d 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -25,42 +25,44 @@ enum { COLIBRI_PXA270_V1_520MHZ, COLIBRI_PXA320, COLIBRI_PXA300, - COLIBRI_PXA310, + COLIBRI_PXA310, /* 5 */ COLIBRI_PXA320_IT, COLIBRI_PXA300_XT, COLIBRI_PXA270_312MHZ, COLIBRI_PXA270_520MHZ, - COLIBRI_VF50, /* not currently on sale */ - COLIBRI_VF61, + COLIBRI_VF50, /* 10 */ + COLIBRI_VF61, /* not currently on sale */ COLIBRI_VF61_IT, COLIBRI_VF50_IT, COLIBRI_IMX6S, - COLIBRI_IMX6DL, + COLIBRI_IMX6DL, /* 15 */ COLIBRI_IMX6S_IT, COLIBRI_IMX6DL_IT, + /* 18 */ + /* 19 */ COLIBRI_T20_256MB = 20, COLIBRI_T20_512MB, COLIBRI_T20_512MB_IT, COLIBRI_T30, COLIBRI_T20_256MB_IT, - APALIS_T30_2GB, + APALIS_T30_2GB, /* 25 */ APALIS_T30_1GB, APALIS_IMX6Q, APALIS_IMX6Q_IT, APALIS_IMX6D, - COLIBRI_T30_IT, + COLIBRI_T30_IT, /* 30 */ APALIS_T30_IT, COLIBRI_IMX7S, COLIBRI_IMX7D, APALIS_TK1_2GB, - APALIS_IMX6D_IT, + APALIS_IMX6D_IT, /* 35 */ COLIBRI_IMX6ULL, - APALIS_IMX8QM, /* 37 */ - COLIBRI_IMX8X, + APALIS_IMX8QM_WIFI_BT_IT, + COLIBRI_IMX8QXP_WIFI_BT_IT, COLIBRI_IMX7D_EMMC, COLIBRI_IMX6ULL_WIFI_BT_IT, /* 40 */ COLIBRI_IMX7D_EPDC, - APALIS_TK1_4GB, + APALIS_TK1_4GB, /* not currently on sale */ COLIBRI_T20_512MB_IT_SETEK, COLIBRI_IMX6ULL_IT, COLIBRI_IMX6ULL_WIFI_BT, /* 45 */