From patchwork Mon Aug 16 13:13:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1517172 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpF4M1CVnz9t25 for ; Mon, 16 Aug 2021 23:14:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B08F282EBD; Mon, 16 Aug 2021 15:14:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id A4AEF8311A; Mon, 16 Aug 2021 15:14:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C0C2982DFA for ; Mon, 16 Aug 2021 15:13:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from toolbox.cardiotech.int ([81.221.233.3]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MO8aA-1mCKeQ3t9Y-005ZtF; Mon, 16 Aug 2021 15:13:51 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Marcel Ziswiler , Denys Drozdov , Igor Opaniuk , Simon Glass Subject: [PATCH v1 3/5] toradex: tdx-cfg-block: add new i.mx 6ull and 8m plus skus Date: Mon, 16 Aug 2021 15:13:33 +0200 Message-Id: <20210816131335.142993-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210816131335.142993-1-marcel@ziswiler.com> References: <20210816131335.142993-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:JpknuuMwa15lajselD3gEW4wQ8SH1P+PmOiql3Qn0ARySSyWftF UJ0axl1AqtmXh8JSTcL6pN/lUh8hRz9FHZL+0ni3qz03cg4EAEc4hLnEeykp0ZCeY94ihoA G4bJv+IBUOrCpWS+SEyHbt5Jq2WYZWO/4OsOThTU2iRY4XjDmXDhFihY1KJ5duMZngUmLox 4cwcwrxJnNxMM2ifoZiJA== X-UI-Out-Filterresults: notjunk:1;V03:K0:a6etiKTEFA8=:Rj1sMwoKIsZ82SbAZ/e1ai igk0wJjTGDcEZkMOkl8Ozu7kX7l+KDEmRRZkBuDapEyg5qwLFBOV2I4/tWeTFuCVcGjRe8SMl /vp+n3dFTDLzyEXt8mF2O+CobGdacdsetQYVwTM/u+KW9fWBHs4JRmrKTvb6u2gwAda1jMcFu XBwSYD0gtWHj3RsVA9OXHflvv3v1so5bM88cN9DQChAxQFinToUXG2TfcOVI7oHbIsHc8EE8b 2ZQYlbC15Jx8JASojovNBM8j1c9TO1bKTdy4s3LQxoWNBKDwWHp0zojw8U36MDvWEY7Kbj8m4 2DpzLvjvq/L/qb+7G802QImSkvgqRVqvXsRL6c0FD59Cgc0Ez7VwLLqQEdb2HbfYWYFiKC9Se +9gNOCV+ndmvDdDOdo9MGkdnTznYtnUopGPB8JdQ/wKoc4CSku8nIlrTTLyq8AfZ7OBgsXG3T iCAfcre2EVxosugaa7mFTxXNAYay274rEUzAcAJsD9TsdGKf1nrKQgb1VPSvOGnmynePvLzRk FpwHerRnQ2+Cu0SFMRvKitYO+QR+id8oUxGlkHU/Zaexvl1ccbaPOjg6oaSC5hu6vSnfOErRW zqg9qryoLx7uCYqtWZtVGGRAfZ1SDWb2Nguj/OpjNyeI9l7Iv3hjRY3t1vy+LGRcvFUeJSsa8 VsC0Q9kid4+5/sdFmRhrNyT89xOG/Ed7GBvnM+f+UsPT3B71Htn8EV9JfV6cooUWumUJDhdw3 gahKMqveLN8qSrVypXaHFh2LhuY6/ltBPo19a7Wrsuiszrpbm3uUPPY46Cnu1BJ7834GGWuWs J+O4A0ONj8yWmTooKUBEZWNRRf7wUSHs+sHQqSEswOywjVM33C6D0wbGqpu6fYY9kOLz8dy X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Add new i.MX 6ULL and 8M Plus SKUs to ConfigBlock handling: 0062: Colibri iMX6ULL 1GB IT (eMMC) 0063: Verdin iMX8M Plus Quad 4GB IT 0064: Verdin iMX8M Plus Quad 2GB Wi-Fi / BT IT 0065: Verdin iMX8M Plus QuadLite 1GB IT 0066: Verdin iMX8M Plus Quad 8GB Wi-Fi / BT Signed-off-by: Marcel Ziswiler --- board/toradex/common/tdx-cfg-block.c | 29 ++++++++++++++++++++++++---- board/toradex/common/tdx-cfg-block.h | 5 +++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 1295f389896..d996a7ae7eb 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -145,6 +145,11 @@ const char * const toradex_modules[] = { [59] = "Verdin iMX8M Mini Quad 2GB IT", [60] = "Verdin iMX8M Mini DualLite 1GB WB IT", [61] = "Verdin iMX8M Plus Quad 2GB", + [62] = "Colibri iMX6ULL 1GB IT (eMMC)", + [63] = "Verdin iMX8M Plus Quad 4GB IT", + [64] = "Verdin iMX8M Plus Quad 2GB Wi-Fi / BT IT", + [65] = "Verdin iMX8M Plus QuadLite 1GB IT", + [66] = "Verdin iMX8M Plus Quad 8GB Wi-Fi / BT", }; const char * const toradex_carrier_boards[] = { @@ -415,7 +420,10 @@ static int get_cfgblock_interactive(void) if (wb == 'y' || wb == 'Y') tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT_IT; else - tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; + if (gd->ram_size == 0x20000000) + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT; + else + tdx_hw_tag.prodid = COLIBRI_IMX6ULL_IT_EMMC; } else { if (wb == 'y' || wb == 'Y') tdx_hw_tag.prodid = COLIBRI_IMX6ULL_WIFI_BT; @@ -424,7 +432,10 @@ static int get_cfgblock_interactive(void) } #endif } else if (!strcmp("imx7d", soc)) - tdx_hw_tag.prodid = COLIBRI_IMX7D; + if (gd->ram_size == 0x20000000) + tdx_hw_tag.prodid = COLIBRI_IMX7D; + else + tdx_hw_tag.prodid = COLIBRI_IMX7D_EMMC; else if (!strcmp("imx7s", soc)) tdx_hw_tag.prodid = COLIBRI_IMX7S; else if (is_cpu_type(MXC_CPU_IMX8QM)) { @@ -474,11 +485,21 @@ static int get_cfgblock_interactive(void) tdx_hw_tag.prodid = VERDIN_IMX8MMQ_IT; } else if (is_cpu_type(MXC_CPU_IMX8MN)) { tdx_hw_tag.prodid = VERDIN_IMX8MNQ_WIFI_BT; + } else if (is_cpu_type(MXC_CPU_IMX8MPL)) { + tdx_hw_tag.prodid = VERDIN_IMX8MPQL_IT; } else if (is_cpu_type(MXC_CPU_IMX8MP)) { if (wb == 'y' || wb == 'Y') - tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT; + if (gd->ram_size == 0x80000000) + tdx_hw_tag.prodid = VERDIN_IMX8MPQ_2GB_WIFI_BT_IT; + else if (gd->ram_size == 0x200000000) + tdx_hw_tag.prodid = VERDIN_IMX8MPQ_8GB_WIFI_BT; + else + tdx_hw_tag.prodid = VERDIN_IMX8MPQ_WIFI_BT_IT; else - tdx_hw_tag.prodid = VERDIN_IMX8MPQ; + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = VERDIN_IMX8MPQ_IT; + else + tdx_hw_tag.prodid = VERDIN_IMX8MPQ; } 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 9debd5f0462..ddcf6997480 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -82,6 +82,11 @@ enum { VERDIN_IMX8MMQ_IT, VERDIN_IMX8MMDL_WIFI_BT_IT, /* 60 */ VERDIN_IMX8MPQ, + COLIBRI_IMX6ULL_IT_EMMC, + VERDIN_IMX8MPQ_IT, + VERDIN_IMX8MPQ_2GB_WIFI_BT_IT, + VERDIN_IMX8MPQL_IT, /* 65 */ + VERDIN_IMX8MPQ_8GB_WIFI_BT, }; enum {