From patchwork Tue Jan 28 13:42:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1230355 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.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 phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 486SVd2DHKz9sNx for ; Wed, 29 Jan 2020 00:43:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 75F4281AF0; Tue, 28 Jan 2020 14:42:57 +0100 (CET) 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 C518581AED; Tue, 28 Jan 2020 14:42:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) (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 C2BBA81AA3 for ; Tue, 28 Jan 2020 14:42:45 +0100 (CET) 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 marcel-nb-toradex-int.toradex.int ([31.10.206.124]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MI55X-1il78o1kxz-00FDwk; Tue, 28 Jan 2020 14:42:41 +0100 From: Marcel Ziswiler To: Igor Opaniuk Subject: [PATCH v3 3/7] toradex: tdx-cfg-block: add Verdin iMX8M Mini/Nano support Date: Tue, 28 Jan 2020 14:42:24 +0100 Message-Id: <20200128134229.106794-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200128134229.106794-1-marcel@ziswiler.com> References: <20200128134229.106794-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:CffgIHh/MVdsLi41AeKvdY9C8XCoiD8KU0sa2Gnu6+xJeb1dxzU +n1x9IMjyC+fkMPpkK869BS3msMShag4kgBsEoztN3N3gh2aN3NTVOkKe8Ba9UsI/1esBta Nq9RsFwmzH87r++PZvX1uj4QVQzNOFVgwNlCFeeSjRtmG80JV203HlWTVSHSn++9CJW2yym rjSOQBcPZFHGNP3mxxgZQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:4cY9s1cK4DI=:ooc1idYd9K5DsrJL94xW5H qTTYSDEK65Hn9D2HpbwNtxsNHgXG/oZ/SrthvQNZOhFSZAbxJO/0hbScJgsXPoN8TJYsLKKg6 ytG9JmmMGMQUxvdske9HvrsdVJyUDXvKGUumRUrT8oUDFceW5W6I4IH/lvW/1eCbPR5kw0o85 LnGCeVlW8u8mtxZ9qZp84JixLwGQ12LDvPwEuVhVZdX8/bpNJptK5PxFlt4H8tpfllIYXNIh2 m6lOF7y9VToNZjtJd+9iRhLtHTJPK0rZ9DKl37iJWbZvKqOSIWVcITz2aWEf9teEpTrgFMPSm jC5IfJOOhO2heOFuI9NG3sYdqg/uNoty1WOSuy/qcGXDjHcufW30X58Qv7N2Ya3XsIJgq+X5Y Du/hqWO/nHWDJMx4qPnsGmJLBmYYQxKVouobs9WHf2HPysPIc8Vujdco1sQq8ao0SjXrLWj6Z e+LG0/+z1ZDbWoj/ST8AY+V8JIDXsjM36fRPxOKNwmDy9agpm1fg2sTHHUmJpodOTDtTPkUSM 8rnxgCmmPFSSKsupN/HwSlpdScwzfmzJn86qPMAb2o0RHpgvyEc+qcS6ekvAzYe4JMzNr5SJI LPMFpHZvD+H9g11CpPcaq7OkQWKWDAkHeOKe17U6kSTETGFXl/M0pUlmoxFoex+I5V416ITxP t+cV+feLspA4pJWlwbahaxzd0sj4PlR1k4HufUfw5n7eZEIUMQSY5+KK3vo0AWbWjXJZEa0eH ONgkUA/w4ETLtlTtDrzgJ+EUBLAdZA1NN3ug9Psn5Upo/UhUc5ho1sQg2TUfn76w2yWrR5xuX 5hlSOIceOumU3VW3YKrpjPZcQkCdpIsRyW7OOs6K+TIr1JTFUCy3ElLnyR+11c9wqOIT0LS X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerard Salvatella , Stefan Agner , Marcel Ziswiler , u-boot@lists.denx.de, Max Krummenacher , Dominik Sliwa Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Add support for storing configuration for Verdin iMX8M Mini and Nano SoMs in Toradex config block. Signed-off-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk Reviewed-by: Oleksandr Suvorov --- Changes in v3: - Add missing config block information for Verdin iMX8M Nano as well. - Add Oleksandr's reviewed-by tag. Changes in v2: - Split Apalis iMX8X off from this one as suggested by Oleksandr. board/toradex/common/tdx-cfg-block.c | 22 ++++++++++++++++++++-- board/toradex/common/tdx-cfg-block.h | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 4d7d2b218c..1b6c911418 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -10,7 +10,9 @@ defined(CONFIG_TARGET_APALIS_IMX8) || \ defined(CONFIG_TARGET_APALIS_IMX8X) || \ defined(CONFIG_TARGET_COLIBRI_IMX6) || \ - defined(CONFIG_TARGET_COLIBRI_IMX8X) + defined(CONFIG_TARGET_COLIBRI_IMX8X) || \ + defined(CONFIG_TARGET_VERDIN_IMX8MM) || \ + defined(CONFIG_TARGET_VERDIN_IMX8MN) #include #else #define is_cpu_type(cpu) (0) @@ -115,6 +117,9 @@ const char * const toradex_modules[] = { [52] = "Colibri iMX8 DualX 1GB", [53] = "Apalis iMX8 QuadXPlus 2GB ECC IT", [54] = "Apalis iMX8 DualXPlus 1GB", + [55] = "Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT", + [56] = "Verdin iMX8M Nano SoloLite 1GB", /* not currently on sale */ + [57] = "Verdin iMX8M Mini DualLite 1GB", }; #ifdef CONFIG_TDX_CFG_BLOCK_IS_IN_MMC @@ -297,17 +302,24 @@ static int get_cfgblock_interactive(void) char *soc; char it = 'n'; char wb = 'n'; - int len; + int len = 0; /* Unknown module by default */ tdx_hw_tag.prodid = 0; if (cpu_is_pxa27x()) sprintf(message, "Is the module the 312 MHz version? [y/N] "); +#if !defined(CONFIG_TARGET_VERDIN_IMX8MM) || !defined(CONFIG_TARGET_VERDIN_IMX8MN) else sprintf(message, "Is the module an IT version? [y/N] "); + len = cli_readline(message); it = console_buffer[0]; +#else + else + it = 'y'; +#endif + #if defined(CONFIG_TARGET_APALIS_IMX8) || \ defined(CONFIG_TARGET_APALIS_IMX8X) || \ @@ -361,6 +373,12 @@ 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_IMX8MM)) + tdx_hw_tag.prodid = VERDIN_IMX8MMQ_WIFI_BT_IT; + else if (is_cpu_type(MXC_CPU_IMX8MMDL)) + tdx_hw_tag.prodid = VERDIN_IMX8MMDL; + else if (is_cpu_type(MXC_CPU_IMX8MN)) + tdx_hw_tag.prodid = VERDIN_IMX8MNSL; else if (is_cpu_type(MXC_CPU_IMX8QM)) { if (it == 'y' || it == 'Y') { if (wb == 'y' || wb == 'Y') diff --git a/board/toradex/common/tdx-cfg-block.h b/board/toradex/common/tdx-cfg-block.h index 99628d96dc..d8f3941f26 100644 --- a/board/toradex/common/tdx-cfg-block.h +++ b/board/toradex/common/tdx-cfg-block.h @@ -75,6 +75,9 @@ enum { COLIBRI_IMX8DX, APALIS_IMX8QXP, APALIS_IMX8DXP, + VERDIN_IMX8MMQ_WIFI_BT_IT, + VERDIN_IMX8MNSL, + VERDIN_IMX8MMDL, }; extern const char * const toradex_modules[];