From patchwork Wed Oct 6 21:27:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537396 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPnct5KXrz9sXS for ; Thu, 7 Oct 2021 08:28:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 112C683433; Wed, 6 Oct 2021 23:28:26 +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 264C183404; Wed, 6 Oct 2021 23:28:23 +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,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 43540832CD for ; Wed, 6 Oct 2021 23:28:19 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MHmnb-1mVDFi34Gr-003dqB; Wed, 06 Oct 2021 23:28:08 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Heiko Schocher , Ilko Iliev , Jagan Teki , "NXP i.MX U-Boot Team" , Peng Fan , Teresa Remmet Subject: [PATCH v4 01/10] imx8m: clean-up kconfig indentation Date: Wed, 6 Oct 2021 23:27:47 +0200 Message-Id: <20211006212757.464740-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:oJ59imNvJgcIYbeMYJFLrv0CCuDWtYkmqXmTAmw+QNjz6eurPc/ RvLrPjyGPr0htm8oQdxsGc0jDAc9Gxt56Q32wQILWWh7sbKq/Ofppn+OmERTh2N6cMakM1d cfSt3vLuYCvFKco0grqycko7QX4Iz0Q0clzv8RQJ808hE09OgJZS8BrMLz9LcqNsw6Sdu/g OzEU/9cMpYAJrRmV+prOQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:U1sC5HCe/kE=:BznnhLamspoRAba1gPEAVT BRCWnqjgn6NqOdG/OqlJjET5RbFX5w8GRU2KeK27ZQYUXsTmhxFk01q+4Tm24Ma+1enCW5tUf PhLg02qHRGlrUgaGpf+tXEZPODzEeNR3H8M1eheqgC/1H9XfzB7BVW0tXm6ZFUZoQJF7iRoko dbmwrvJjd19oCYAtzVGmj4nMznFmB5YVfnwop3ZhgIPpSeN5Y3a5lOauSh3RZz5acNEaLUKE6 ovImYlBIZXyHkr/AUPjDy3ibAGBudo//gjP5LbRcx5U2g9GnECGz9JLY4HMLbkRzT0C7XSB9F FxoymwhZNEj1uOZazu0uTDWV6zZgH4+qY1XiIOijaDevJZ3BrwK+4Uf+WYJgm2J1N2MA8deKT NwSrS4M6d3lk8nHv5lWI0rR8vcMZFgmLCVIxzEZkEKqtwHWyHcPfYSFlCP1VLFFQqJxV3h7ED A+MHgIVnwf3GeGW7u/IOkXK6GvbkbS/uZVYQvUnVk2PrJOQDhSmqj7e5hWf5Yfb9QQ8jCr4rT jKOK+EOhVtMBND7mD526yBBw2bMuj4EaW4tFS89TGTFsPYFp09hk760U6R/NtVDl9KX85XL5V kerSR8o8mRO3lfcPwLPnCzUXomeZ51aK4kKQu5qyI909pq9NoTCFs4ANiH6qLiVXwxb7wHVPo QBHrMKC1fcvTod5+evbrqfzfteltQlUezHoG5Vooas51xrLIZDBdiYK4lcauPYjxYmvKLRxaW KSdYPz69k6R6/rOktFFvEQZcg4V+XeWCpmV4Xw== 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 Replace spurious spaces with proper tabs. Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v1) arch/arm/mach-imx/imx8m/Kconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 1d08a2977f5..a2ba30cf332 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -25,14 +25,14 @@ config SYS_SOC default "imx8m" choice - prompt "NXP i.MX8M board select" + prompt "NXP i.MX8M board select" optional config TARGET_IMX8MQ_CM - bool "Ronetix iMX8MQ-CM SoM" + bool "Ronetix iMX8MQ-CM SoM" select BINMAN - select IMX8MQ - select IMX8M_LPDDR4 + select IMX8MQ + select IMX8M_LPDDR4 config TARGET_IMX8MQ_EVK bool "imx8mq_evk" @@ -105,10 +105,10 @@ config TARGET_PICO_IMX8MQ select IMX8M_LPDDR4 config TARGET_VERDIN_IMX8MM - bool "Support Toradex Verdin iMX8M Mini module" - select IMX8MM - select SUPPORT_SPL - select IMX8M_LPDDR4 + bool "Support Toradex Verdin iMX8M Mini module" + select IMX8MM + select SUPPORT_SPL + select IMX8M_LPDDR4 config TARGET_IMX8MM_BEACON bool "imx8mm Beacon Embedded devkit" @@ -125,14 +125,14 @@ config TARGET_IMX8MN_BEACON config TARGET_PHYCORE_IMX8MM bool "PHYTEC PHYCORE i.MX8MM" select IMX8MM - select SUPPORT_SPL + select SUPPORT_SPL select IMX8M_LPDDR4 config TARGET_PHYCORE_IMX8MP bool "PHYTEC PHYCORE i.MX8MP" select BINMAN select IMX8MP - select SUPPORT_SPL + select SUPPORT_SPL select IMX8M_LPDDR4 config TARGET_IMX8MM_CL_IOT_GATE From patchwork Wed Oct 6 21:27:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537397 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPnd70Xpcz9sXS for ; Thu, 7 Oct 2021 08:28:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DECAE83490; Wed, 6 Oct 2021 23:28:36 +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 899CA83310; Wed, 6 Oct 2021 23:28:25 +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,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 2257183310 for ; Wed, 6 Oct 2021 23:28:21 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Me9Ie-1m8RRU0N02-00Pxoq; Wed, 06 Oct 2021 23:28:10 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Igor Opaniuk , Max Krummenacher , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v4 02/10] verdin-imx8mm: fix ethernet Date: Wed, 6 Oct 2021 23:27:48 +0200 Message-Id: <20211006212757.464740-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:gUwpizu/23yg0MNDQqI9QEGF9IWoN9Tmykxkq0+bW06JsfNaWqa YCQKepvI6oNMvOWpdlp08Y3vdTVfhDig86eo+B+hyrwQ9x0Wo8ZFTkqeGqnJ+pqIrRXvqnx UNg0Fa6yy4EmjrQrlIlHS3XMR6MlqMN+JBaOq947mGLkX0kvDJ6/h+GC3w73OSBHhrAAnzO wJHXpfIrILM09ea3Tzrmw== X-UI-Out-Filterresults: notjunk:1;V03:K0:/x0v0dUdYsc=:g8P/NneL+zAsmbJow3S0Co Owd4ntWIPLwJHKYxmBpo2HO9fjFXgLaLvgu1jL/J+FzzhzyRJLKeJj1AgkYwqDLjjYa+QWIkY NNUYkHtWcsULxaVnqGaXdW1YUzaL0kyRCIOmbeeECn3j6Fq2b4z3aqtV5S4+EukFjrZt2cpJR 3Tc1TQ7cbgv9maj5+r8z0RyY4OIrvLvDz9m1SmB3dkfc5cTpSUB9qvQtDQyxwz4BOAm2piqXj 3xqnvu3BLDoKjRdnrIC7ezjVID6hngFpSTigXz0t4zh7y9831ZPODwcRYzevYFnBZEMzNnwSM GIS9jj8LeI7nXO1h+3ncc0ceiKLYemGZy7xt3BXAbmDanIChcWa5q7O3unBmQI3Pg5bH8DpkF MQR6MUAof68JW8wn+30TetzIWzjjTd+sTZqC3pHS/sJWuKXf/2D/EiIekBw7UQW/9UQR/9WrG ixtFySG3aVr1M2O3owVy/mbNIPep3WMDw7p8XWtd5n7xsnNbAuI8J+VlM9N0U9DiEqmywPERS iUphy2FVjz1NNYqKV+OC6qN/ngTk8JZXPq9Wshx1IyRBRdW8mqpi5nR6cuytChKLBkPr1Q1Kr nfOStTFMmFq5DbmU3SkCaA4x93P9Ollzz15xIq6LsvCpkD2UTPxJA9o+y8bhl3PeGvevhzlso jdYi65eZPIx8NB3mAmKL6D/ohke7ChY7s1cIY2ObGKeSL3obGx/w67NGg0kRSjrJmkTCTDueW 7RMcbzaMYCHydwHxAsXih+iJ16fpQrdG/JscSw== 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 Turns out Microship (formerly Micrel) meanwhile integrated proper support for the DLL setup on their KSZ9131. Unfortunately, this conflicts with our previous board code doing that. Fix this by getting rid of our board code and just relying on the generic implementation relying on rgmii-id being used as phy-mode. Fixes: commit c6df0e2ffdc4 ("net: phy: micrel: add support for DLL setup on ksz9131") Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v1) arch/arm/dts/imx8mm-verdin.dts | 2 +- board/toradex/verdin-imx8mm/verdin-imx8mm.c | 64 --------------------- 2 files changed, 1 insertion(+), 65 deletions(-) diff --git a/arch/arm/dts/imx8mm-verdin.dts b/arch/arm/dts/imx8mm-verdin.dts index fb0756d6e19..ac2a4b69d3c 100644 --- a/arch/arm/dts/imx8mm-verdin.dts +++ b/arch/arm/dts/imx8mm-verdin.dts @@ -160,7 +160,7 @@ &fec1 { fsl,magic-packet; phy-handle = <ðphy0>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-supply = <®_ethphy>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_fec1>; diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 76f4a1e209a..1644f4b3081 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -36,70 +36,6 @@ static int setup_fec(void) return 0; } - -int board_phy_config(struct phy_device *phydev) -{ - int tmp; - - switch (ksz9xx1_phy_get_id(phydev) & MII_KSZ9x31_SILICON_REV_MASK) { - case PHY_ID_KSZ9031: - /* - * The PHY adds 1.2ns for the RXC and 0ns for TXC clock by - * default. The MAC and the layout don't add a skew between - * clock and data. - * Add 0.3ns for the RXC path and 0.96 + 0.42 ns (1.38 ns) for - * the TXC path to get the required clock skews. - */ - /* control data pad skew - devaddr = 0x02, register = 0x04 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_CTRL_SIG_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x0070); - /* rx data pad skew - devaddr = 0x02, register = 0x05 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_RX_DATA_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x7777); - /* tx data pad skew - devaddr = 0x02, register = 0x06 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_TX_DATA_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x0000); - /* gtx and rx clock pad skew - devaddr = 0x02,register = 0x08 */ - ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9031_EXT_RGMII_CLOCK_SKEW, - MII_KSZ9031_MOD_DATA_NO_POST_INC, - 0x03f4); - break; - case PHY_ID_KSZ9131: - default: - /* read rxc dll control - devaddr = 0x2, register = 0x4c */ - tmp = ksz9031_phy_extended_read(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_RXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC); - /* disable rxdll bypass (enable 2ns skew delay on RXC) */ - tmp &= ~MII_KSZ9131_RXTXDLL_BYPASS; - /* rxc data pad skew 2ns - devaddr = 0x02, register = 0x4c */ - tmp = ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_RXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC, tmp); - /* read txc dll control - devaddr = 0x02, register = 0x4d */ - tmp = ksz9031_phy_extended_read(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_TXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC); - /* disable txdll bypass (enable 2ns skew delay on TXC) */ - tmp &= ~MII_KSZ9131_RXTXDLL_BYPASS; - /* rxc data pad skew 2ns - devaddr = 0x02, register = 0x4d */ - tmp = ksz9031_phy_extended_write(phydev, 0x02, - MII_KSZ9131_EXT_RGMII_2NS_SKEW_TXDLL, - MII_KSZ9031_MOD_DATA_NO_POST_INC, tmp); - break; - } - - if (phydev->drv->config) - phydev->drv->config(phydev); - return 0; -} #endif int board_init(void) From patchwork Wed Oct 6 21:27:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537399 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPndW6Q1Vz9sXS for ; Thu, 7 Oct 2021 08:29:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2896B83458; Wed, 6 Oct 2021 23:28:52 +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 1A27983476; Wed, 6 Oct 2021 23:28:32 +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,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 56FC98340A for ; Wed, 6 Oct 2021 23:28:24 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M5ukJ-1mjhje24r3-00xvKF; Wed, 06 Oct 2021 23:28:11 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Simon Glass , Tom Rini Subject: [PATCH v4 03/10] ARM: dts: imx8mm-verdin: prepare for dek blob encapsulation Date: Wed, 6 Oct 2021 23:27:49 +0200 Message-Id: <20211006212757.464740-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1vJcyqArUcm7007yBzXFCpA/Wmrvgd86AfgyE3ss8gey8D6tswE +ghGtInTBgf9bKHA88ci5luK1lGEjwxZh6w+K3qwqVz7QNAKVAOAT1KFZx7jLBgRZ1AYkTT HWY7lXouQTt6MrE0P95KiBhkO+/p2WxQwElSKY3JrPA8hB8qikIYssl0VBd4OrsDim9UpB6 IX7QAaZaA7oaIbyunOyeg== X-UI-Out-Filterresults: notjunk:1;V03:K0:XVmqmMTzBzk=:oVKtIgTsPlqLf4QZnYYQuC 5m0zfC4zb+9S2iPFODt9jGJiOfm5HOF4ZFeygOnSqUDHHRGQUh7rE8jy9riFwCZNOZ7ElqMAB 2yO5dusPK/FEFfTekd8sAIUDPaP5UYVsCSJl5djL/tJNKCMPm7nxPFSapCYJHenPRFqfMblQz Sf0lTaCKF+gtbN0PPgPbFZ5+zEsIk8GQrg5j7BsnGdW41JJWQ4p1XVIMXCoQYWwrK8dPNB7Ur hiGsViMCtPibCQQyYEaTM+zWvB7KND1/lYjytY3Me68G56+gjGPCJb0inlEt+F5ULktzDNGfw 45ahzBbfoNb7R4bU8Y8pYFmFc/Qmz5XtblTY0bXgRnJnnbJ0c9UAEsvjDEQgvfbU8aPLR9p63 VPAtY13YhCa/v52XFIPJt+phqxrUrmuZzScxU/lm53ITTowmV20/nLnVt5MjRArPT5hsxplPH vfi35/+nGtnDGm3Ns0O7hnIroVdD5XTSoVvc4PMRwFuZkvjHs8O0e1KfhZd18AEZDr22mYIIq o8GzSAW8YcS5lhfGORn25h/aXxBMxHa08PMSPhwrSUeHVYBSuxGpjFKTB6FeVYV52qBrRDVwQ cp/ianHeymg4H0ChxJtTzGyO7KYbIiLFwH7tipTQMynkoxFG/uGb8y2S6hflVrX/WjgJt+w1T d0d8pLJmqshsC4Sw9WzZUuPBGNQmbNd7WxZsgrgSDpy+SXAfgFSQ2uu9/QkqaywGebh+BQWIt sl29CjdTJ6iUzO/lIV2nUdSY3/M/9cVn8sJGpg== 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 Prepare for DEK blob encapsulation support through "dek_blob" command. On ARMv8, u-boot runs in non-secure, thus cannot encapsulate a DEK blob for encrypted boot. The DEK blob is encapsulated by OP-TEE through a trusted application call. U-boot sends and receives the DEK and the DEK blob binaries through OP-TEE dynamic shared memory. To enable the DEK blob encapsulation, add to the defconfig: CONFIG_SECURE_BOOT=y CONFIG_FAT_WRITE=y CONFIG_CMD_DEKBLOB=y Taken from NXP's commit 56d2050f4028 ("imx8m: Add DEK blob encapsulation for imx8m"). Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v1) arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi index 67c31c49b6c..a97626fa0c1 100644 --- a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi @@ -6,6 +6,13 @@ #include "imx8mm-u-boot.dtsi" / { + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; + wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>; From patchwork Wed Oct 6 21:27:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537401 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPnf23Kq3z9sXS for ; Thu, 7 Oct 2021 08:29:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B7D783483; Wed, 6 Oct 2021 23:29:11 +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 C88D583458; Wed, 6 Oct 2021 23:28:49 +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,SPF_NONE 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 0E8458344A for ; Wed, 6 Oct 2021 23:28:26 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LllQs-1n7ZD31WOu-00ZO9q; Wed, 06 Oct 2021 23:28:13 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Heiko Schocher , Igor Opaniuk , Ilko Iliev , Jaehoon Chung , Jagan Teki , Marek Vasut , Max Krummenacher , "NXP i.MX U-Boot Team" , Peng Fan , Simon Glass , Teresa Remmet Subject: [PATCH v4 04/10] verdin-imx8mm: switch to use binman to pack images Date: Wed, 6 Oct 2021 23:27:50 +0200 Message-Id: <20211006212757.464740-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Wq7s/MxuEmY0gzpZPAl+rhipLPGZXMheSTtiq01x32YJCKDd5RX UzlYYrrrjVlrUkXgZf+aSMnwF1pI84A85wLxySgePbcPE7kmRnA31Tm0KWuOt7dLGFvbcd5 CeC6Ie9VQ84OYykMYqKRGMR9hhUukuB6TI9glO3dODM4nah3lcdj8yzcy7KtKy6QiBUl+0L Y+kClECUisoWzLx/aFcTw== X-UI-Out-Filterresults: notjunk:1;V03:K0:BhZDpBjz0Hw=:/FlA+TQqTMjglTPIGAj4IQ 6PQ8U7vCgCTtUen3aAkiVEoHL6KHeZg/8Mdv1eF0g9zhtd96CEJnGew4E6aPKVO9v7ENUJ4cE 3vz5u/MTuoSxAUdQOEunIV0O/a8JAgYk9AsiM4nNhJh96o7r4gyK8W1E/bbKwqWz1CoBxebr4 4Dnqn0nBa3Nkte3MBdR+BS0j/6UEYutf2wPFvbJiiEzlImKJhkQ/DfSY/MKSopsPViWF0WsKO xmQQlgdZzIRZJiJVQfM3jo/apwASE3gPIau3FCOLd5OcnZmI8ppmT51Ztn6HTe+N5vKGwm0mu DG4aPPvKjE+x0Q/sl9o0O6JVe5PQsadtJGJgkqGNNmUNvMtr/R0Vz9iHoAysAwuOsaZ4BCBKh 8fPtP4ONnYJeH1AT3tmJVuQTiIw3n5QVRTfNoGdmM5Jtk/ngUNTneh0MHzcru26v/Hx5BCz22 URR1UiAFIhg9wnR214sHsTsATnrBymm+XwiQ+/hLNn+SpFGIjV4GzHHi/q4rmYMmcjrydbXS4 1K6EeeZ0IJQ4a0QtBgji7esqHGjbRTBGXOPoPYTK8fFEF1Aik2Kb2N3iboBsEMwss1S0btlaN Uq87RlHlT/iGJzSrYLogM9vREzP0s3m2dKBFwbUxK6EqSH8/sr1G0lVvsXYOVVFxrLjoAn87X VWUf80QO4WG0Ig3Gj8W0DK0xiTOvgCEYAm/svzj1ehcY3Q1nyArAYIMtsc2ine1j+eBcjKVf0 eUpmV8U263yPuBhVI2V+xKVhgfEYvxLe77hVTA== 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 Use binman to pack images. Signed-off-by: Marcel Ziswiler Reviewed-by: Heiko Thiery Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher Reviewed-by: Simon Glass --- Changes in v4: - Add Heiko Schocher's reviewed-by tag. - Fix copyright periods. Changes in v3: - Case fold hex string. - Revert binman part of imx8mm-verdin-u-boot.dtsi to a plain copy from imx8mm-evk and postpone further improvements to after migrating to a common binman config as agreed with Frieder and Simon. Changes in v2: - Explicitly pass filename to binman when generating binaries as suggested by Heiko. - Use proper intermediate binary u-boot-spl-ddr.bin for imximage as pointed out by Heiko. arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 124 ++++++++++++++++++++++- arch/arm/mach-imx/imx8m/Kconfig | 1 + board/toradex/verdin-imx8mm/imximage.cfg | 11 +- configs/verdin-imx8mm_defconfig | 2 +- doc/board/toradex/verdin-imx8mm.rst | 53 +++++----- 5 files changed, 157 insertions(+), 34 deletions(-) diff --git a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi index a97626fa0c1..0c65070cd5f 100644 --- a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi @@ -1,11 +1,15 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * Copyright 2020 Toradex + * Copyright 2020-2021 Toradex */ #include "imx8mm-u-boot.dtsi" / { + binman: binman { + multiple-images; + }; + firmware { optee { compatible = "linaro,optee-tz"; @@ -91,3 +95,121 @@ &wdog1 { u-boot,dm-spl; }; + +&binman { + u-boot-spl-ddr { + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + u-boot-spl { + align-end = <4>; + }; + + blob_1: blob-ext@1 { + filename = "lpddr4_pmu_train_1d_imem.bin"; + size = <0x8000>; + }; + + blob_2: blob-ext@2 { + filename = "lpddr4_pmu_train_1d_dmem.bin"; + size = <0x4000>; + }; + + blob_3: blob-ext@3 { + filename = "lpddr4_pmu_train_2d_imem.bin"; + size = <0x8000>; + }; + + blob_4: blob-ext@4 { + filename = "lpddr4_pmu_train_2d_dmem.bin"; + size = <0x4000>; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,external-offset = ; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = ; + + uboot_blob: blob-ext { + filename = "u-boot-nodtb.bin"; + }; + }; + + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; + load = <0x920000>; + entry = <0x920000>; + + atf_blob: blob-ext { + filename = "bl31.bin"; + }; + }; + + fdt { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl: blob-ext@1 { + offset = <0x0>; + filename = "spl.bin"; + }; + + uboot: blob-ext@2 { + offset = <0x5fc00>; + filename = "u-boot.itb"; + }; + }; +}; diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index a2ba30cf332..3eccc6b4d4f 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -106,6 +106,7 @@ config TARGET_PICO_IMX8MQ config TARGET_VERDIN_IMX8MM bool "Support Toradex Verdin iMX8M Mini module" + select BINMAN select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 diff --git a/board/toradex/verdin-imx8mm/imximage.cfg b/board/toradex/verdin-imx8mm/imximage.cfg index b8b25ff4201..fcc92009f3b 100644 --- a/board/toradex/verdin-imx8mm/imximage.cfg +++ b/board/toradex/verdin-imx8mm/imximage.cfg @@ -1,16 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2020 Toradex + * Copyright 2020-2021 Toradex */ #define __ASSEMBLY__ -FIT BOOT_FROM emmc_fastboot -LOADER spl/u-boot-spl-ddr.bin 0x7E1000 -SECOND_LOADER u-boot.itb 0x40200000 0x60000 - -DDR_FW lpddr4_pmu_train_1d_imem.bin -DDR_FW lpddr4_pmu_train_1d_dmem.bin -DDR_FW lpddr4_pmu_train_2d_imem.bin -DDR_FW lpddr4_pmu_train_2d_dmem.bin +LOADER u-boot-spl-ddr.bin 0x7e1000 diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index 98799994cea..1c8b505656a 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -23,7 +23,7 @@ CONFIG_SYS_LOAD_ADDR=0x40480000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-verdin-dev.dtb" diff --git a/doc/board/toradex/verdin-imx8mm.rst b/doc/board/toradex/verdin-imx8mm.rst index b9f7dc39c96..a11c82da2f5 100644 --- a/doc/board/toradex/verdin-imx8mm.rst +++ b/doc/board/toradex/verdin-imx8mm.rst @@ -34,10 +34,10 @@ Get the DDR Firmware .. code-block:: bash $ cd .. - $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.4.1.bin - $ chmod +x firmware-imx-8.4.1.bin - $ ./firmware-imx-8.4.1.bin - $ cp firmware-imx-8.4.1/firmware/ddr/synopsys/lpddr4*.bin ./ + $ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.10.1.bin + $ chmod +x firmware-imx-8.10.1.bin + $ ./firmware-imx-8.10.1.bin + $ cp firmware-imx-8.10.1/firmware/ddr/synopsys/lpddr4*.bin ./ Build U-Boot ------------ @@ -46,7 +46,7 @@ Build U-Boot $ export CROSS_COMPILE=aarch64-linux-gnu- $ export ATF_LOAD_ADDR=0x920000 $ make verdin-imx8mm_defconfig - $ make flash.bin + $ make Flash to eMMC ------------- @@ -78,21 +78,28 @@ Output: .. code-block:: bash - U-Boot SPL 2020.01-00187-gd411d164e5 (Jan 26 2020 - 04:47:26 +0100) - Normal Boot - Trying to boot from MMC1 - - U-Boot 2020.01-00187-gd411d164e5 (Jan 26 2020 - 04:47:26 +0100) - - CPU: Freescale i.MX8MMQ rev1.0 at 0 MHz - Reset cause: POR - DRAM: 2 GiB - MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 - Loading Environment from MMC... OK - In: serial - Out: serial - Err: serial - Model: Toradex Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT V1.0A, Serial: - Net: eth0: ethernet@30be0000 - Hit any key to stop autoboot: 0 - Verdin iMX8MM # +U-Boot SPL 2021.10-rc2-00028-gee010ba1129 (Aug 23 2021 - 16:56:02 +0200) +Normal Boot +WDT: Started with servicing (60s timeout) +Trying to boot from MMC1 +NOTICE: BL31: v2.2(release):rel_imx_5.4.70_2.3.2_rc1-5-g835a8f67b +NOTICE: BL31: Built : 18:02:12, Aug 16 2021 + + +U-Boot 2021.10-rc2-00028-gee010ba1129 (Aug 23 2021 - 16:56:02 +0200) + +CPU: Freescale i.MX8MMQ rev1.0 at 1200 MHz +Reset cause: POR +DRAM: 2 GiB +WDT: Started with servicing (60s timeout) +MMC: FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2 +Loading Environment from MMC... OK +In: serial +Out: serial +Err: serial +Model: Toradex Verdin iMX8M Mini Quad 2GB Wi-Fi / BT IT V1.1A, Serial# 06760554 +Carrier: Toradex Verdin Development Board V1.1A, Serial# 10754333 +Setting variant to wifi +Net: eth0: ethernet@30be0000 +Hit any key to stop autoboot: 0 +Verdin iMX8MM # From patchwork Wed Oct 6 21:27:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537400 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPndn45HPz9sXS for ; Thu, 7 Oct 2021 08:29:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A366B83477; Wed, 6 Oct 2021 23:28:58 +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 38B338347F; Wed, 6 Oct 2021 23:28:44 +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,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 A86A383457 for ; Wed, 6 Oct 2021 23:28:27 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MNJ6d-1mRtrz3ld3-006v6B; Wed, 06 Oct 2021 23:28:15 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Max Krummenacher , Marcel Ziswiler , Igor Opaniuk , Jaehoon Chung , Marek Vasut , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v4 05/10] verdin-imx8mm: enable sleep_moci output Date: Wed, 6 Oct 2021 23:27:51 +0200 Message-Id: <20211006212757.464740-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:5R2LP3SFf/RlpEhuKkKlH7uWB+BWoTl6Uja+Rb3lUzgU7pYKcwz o+kU6P7Mie2B2414nqRJB5D+PhPcjrvgKW6OKUg2Jv8UptdWIhZK/WVB608Z3mBPTuwEHkI 9Y+b8ZnrnOAEYFOlqSrlUuMCjg2rTVG9eEE70leW6udPEn4AJ22hUjwLPxQ3PdFNRjihFa1 5PTy4hPcihVUtqNopQR2Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:FiWAzm6oovI=:DH6OH0OxSngTm31weuVcl1 WrYKPmVknnnulV6d+BjGSYE/8K5oVU7sy3ONr6aeBaUxhrNW7R7xWXlXZJVyICpTmkTbVm19h znAPT8hFXAj9ySbuC58Czqw1NuEZCQMA38Ofwhbmlb2ht4U13vi4FDtpIAxM0s/MvwD1c66N7 OxKDy2s+zT+K8ZNUOd3YUNUQMkP3Lll29Bdwcd9ckOEpm9UxfyJyEpEgPaIMlWBptEIXueqSG M9rbaEl2M/3K7zLumItyhiTe3xHZXnJMpM1B5wibmsmYPiPkSn65iE6XetkluHUM8AkkT95t8 ARzFpOdMeB2FTwYVIXc6IVA9JGzGio5iauun29lfZpscdrwqgUdq7R+Dh0bLVYrSA0dYT6xuP 4KV99kYef9IxCL1A10Aku+2B1duu0mYrWx28kqf76U1GAbhNu2tMpo/ZG/uYzf0pvahOIF5oU Z2H1h/Vz8e0dzvC+jzRGyGciYa6NnpFGN0VJC3s3wHh43MH54Ziz2eGsh9qngn2pBREueYWqg 8RuFk8F9hgcdy3J0YRdrJcRNIaFLIW33zCnThWcuE/qP2P9BeToa1gF3Q0xBhHmtgYxIzQax1 xOWPrZi97QHpraHoxPUERYm5EPeyPvLu9fjacUtJQlCbwhpw7jRxIEOO3duuBazdfpwJ9SwmY NxTnkosWA4ANHG/ldcbyFvmmkJVoptqDU4wmeXthsSM9oSCIs8JB/PONXpo4bdJpO0MfuxygL W4a5IBo+70q48vVvdMuMr9sZnhEakXc9gp2L8g== 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: Max Krummenacher This powers some peripherals on the carrier board e.g. the USB hub. Related-to: ELB-3206 Signed-off-by: Max Krummenacher Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v1) arch/arm/dts/imx8mm-verdin.dts | 18 ++++++++++++++++++ configs/verdin-imx8mm_defconfig | 1 + 2 files changed, 19 insertions(+) diff --git a/arch/arm/dts/imx8mm-verdin.dts b/arch/arm/dts/imx8mm-verdin.dts index ac2a4b69d3c..a2331627d72 100644 --- a/arch/arm/dts/imx8mm-verdin.dts +++ b/arch/arm/dts/imx8mm-verdin.dts @@ -196,6 +196,18 @@ }; }; +&gpio5 { + ctrl_sleep_moci { + gpio-hog; + /* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */ + gpios = <1 GPIO_ACTIVE_HIGH>; + line-name = "CTRL_SLEEP_MOCI#"; + output-high; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ctrl_sleep_moci>; + }; +}; + /* On-module I2C */ &i2c1 { clock-frequency = <400000>; @@ -548,6 +560,12 @@ >; }; + pinctrl_ctrl_sleep_moci: ctrlsleepmocigrp { + fsl,pins = < + MX8MM_IOMUXC_SAI3_TXD_GPIO5_IO1 0x1c4 /* SODIMM 256 */ + >; + }; + pinctrl_dsi_bkl_en: dsi_bkl_en { fsl,pins = < MX8MM_IOMUXC_NAND_CE2_B_GPIO3_IO3 0x1c4 /* SODIMM 21 */ diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index 1c8b505656a..ced0d0acc37 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -69,6 +69,7 @@ CONFIG_SPL_CLK_COMPOSITE_CCF=y CONFIG_CLK_COMPOSITE_CCF=y CONFIG_SPL_CLK_IMX8MM=y CONFIG_CLK_IMX8MM=y +CONFIG_GPIO_HOG=y CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y CONFIG_MISC=y From patchwork Wed Oct 6 21:27:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537398 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPndJ5LpGz9sXS for ; Thu, 7 Oct 2021 08:28:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 498F683480; Wed, 6 Oct 2021 23:28:42 +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 62E3B83404; Wed, 6 Oct 2021 23:28:37 +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_H2, SPF_HELO_PASS,SPF_NONE 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 510EA83424 for ; Wed, 6 Oct 2021 23:28:25 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M1Dv4-1mnqTA1pjU-00tGUM; Wed, 06 Oct 2021 23:28:17 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Igor Opaniuk , Max Krummenacher , Simon Glass Subject: [PATCH v4 06/10] verdin-imx8mm: clean-up include order Date: Wed, 6 Oct 2021 23:27:52 +0200 Message-Id: <20211006212757.464740-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:v4YaAkOvjf4mii9IkbyS/UDOqsR2q0N7QDAKYVIMhYUcwun5Xk5 2/uNwhus3DwkpeLH8ItJJypHgQSip1cuvAF6ABTGFaAcNqvCczj0dRi04kVwRFY7Z5ZrCoI pCWIOdW4t2uue4JJ2dg6WgZScU+FSAEvgvPvyNGH2SBTNcd4PSVWvADHT5cG53RIOeEMSXw IrrnfPoj86GV+irdj8b7g== X-UI-Out-Filterresults: notjunk:1;V03:K0:p+rB2BkftM4=:N2TxrKfZ8Qy42x8HG3/l34 bhjEKrSoyIZfLBbSdpx5NI4K8nV+Hs+OuDcQzzrhROpLqJC+JzWjT5mf7XMY7p4ZI7vizAI2Y s3qJlW51sMnDN3xTSKEooG+3nmMvVVzBAs2mvgKc1Hdk+Kg5QdzzD8dzRKOLJkXNda65mcNP+ VD37plalXfw+BALFPzRCfVs3rurJ+ajUNNWb1Zxo14tFcNuEehyXJZNDz75q1swUPXYKvq/wE whJv9mFn3e2OGefFdxojDEuUmo/lDrAcAhyk7QwUQUPsakFDORuZWoGVhwf2h4bEJCmmpEZRQ KvWzrR840a25A5ISDf4VmhzRqU95u+HFQ/u13EFXaQPQUX5gfYcjKRb99xUtY1zWzlptme9Gr mwEP2svPJRDesDF6Otoam3427DrhSCV2yKNeoawBDtdY3w5OmXvPEG9ELPn8fLWo7l98c+H9g etLMbZC/dUX8NSJP0Cd+yR+YjU7alLS25UaOCdjWMxr+YaJr1DR9auxiYR9KWII51WWYCnG/U 72oK6YautCS7EvgUzWrUT9a/3teVvRaY2JkXJkThVQODcI5ICsoc50TLI+/XB5L3f0iMi2GgV 7Z3ex8BWb2GluVx/gFUBci/hrgVOYpLPzxpwzKALq36LWrIzzB0Ln3ROmnTKSVtA2LnLHfIu6 RoSOcxLar43MAmiDkRa1/g/0uZKyN+8Y+gVI/GIOrHHeEcb+UnYIlqFREyaS3zZN3eZRqj/9R n6pp0Ev4BvSUQODyHF8QFWm9A0/FjuEWSqzx2A== 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 Alphabetically order includes. While at it also update copyright year resp. period. Signed-off-by: Marcel Ziswiler --- (no changes since v3) Changes in v3: - New patch cleaning up include order. board/toradex/verdin-imx8mm/verdin-imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 1644f4b3081..71ceb26e811 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2020 Toradex + * Copyright 2020-2021 Toradex */ #include @@ -10,9 +10,9 @@ #include #include #include +#include #include #include -#include #include "../common/tdx-cfg-block.h" From patchwork Wed Oct 6 21:27:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537402 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPnfH5MwDz9sXS for ; Thu, 7 Oct 2021 08:29:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27FA4834B2; Wed, 6 Oct 2021 23:29:15 +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 ED95183460; Wed, 6 Oct 2021 23:28:44 +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,SPF_NONE 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 3969783458 for ; Wed, 6 Oct 2021 23:28:28 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MJAVg-1mVUdd0ZIY-002oE4; Wed, 06 Oct 2021 23:28:19 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Max Krummenacher , Marcel Ziswiler , Igor Opaniuk , Simon Glass Subject: [PATCH v4 07/10] verdin-imx8mm: drop support for v1.0 hardware Date: Wed, 6 Oct 2021 23:27:53 +0200 Message-Id: <20211006212757.464740-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:4ZpZj6M+zAokIJl6VmuOF77+aLTXL1f6S4wtuTudFhX6yU8g+3x 6gElgoWPzWxnuZ21Ns2Y4rjGRY2qr53b9doRI92QM7egffPvJZ50wcIIWSj3yr95DYYJ18L gFvq8ylZIeWMsVaEoc+CsSpEMGpZcJeE8aMiQw+YtUHtzs6XUFFWyl2SGV9rg5+d1ll0R97 BB+7JSU08JOMMyaikjlgw== X-UI-Out-Filterresults: notjunk:1;V03:K0:nQHOKfOLyzQ=:SN7PCpxCKFIfDn4byve5jK bBquXuywi6kPFR9wgqdQDD4BnkfMe76+AhcVadPjx9HcZwmatLW34U+RMP4iKGg9oQ5EwQ04o twwltyuuH8VH0x/NdrpRTbaTGE0PV/hPKn4UbIIJAq2yR7MtpBzoSff08Xn60E4iG/dGKXWXV aDPSYzCJeHQ0ABNHh9m3M5gxjY7gRgtlE1MGT0SWi/CcNjREELQYjl5tMhvP2WuUMyllGn9ZI pnBlfYnmAFYH2q7UEsGDhgOYX08v320hiZ6Q/7uRSpcuw9NTS0x2H0JsU797jI57xnNaDSc2X HbutacxuLnAqefFtHAQJZLTea0+X4xY7lgo5dGEUkXhZvW8phNgGbYooRFEvm7LtqmBsmSWUw +oGsU8Xf292jLXiwdjfaA5jlv1AZGkZQ2rnWogWm7aukh1ziUPZ++340sJQDZOoFyJMF2tFgs L3lxaPQ4wC2JMhCRhaH0s/6Fz1beG61xXiSW9TkiELThOIvC5kkSVFSaMomEViMxcicXoEjeQ m5Ot0EJEjQd6DTgQf45gkd2H8p3IG1Cl16Pk9LVQZnyIubTDcY65EG+OwdB0cX8yskjicschy vVKwm6cFzEaatdTObciHo2UkYt5XtqMjnQmxJ/nz5DMO71a3z+4/x5U5LyEfjSSNbJO4q1X5E k8L0lUYleZOsqQtkuipEQ01yOcRxaMpHJrf1pN04QJmFc4qTUzD7BnlRofi27kfaLmfWjd6pS eg/Bcxtv2v/2sWBx24oFgIuC4wwdazQ3RjYOWA== 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: Max Krummenacher We drop support for Verdin iMX8M Mini V1.0B. Related-to: ELB-3551 Signed-off-by: Max Krummenacher Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- Changes in v4: - Re-based. Changes in v3: - Add Fabio's reviewed-by tag. Changes in v2: - Drop first patch ("imx: mkimage_fit_atf: fix legacy image generation") as a similar fix was already refused earlier. board/toradex/verdin-imx8mm/verdin-imx8mm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c index 71ceb26e811..c51c99b5156 100644 --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -87,17 +88,13 @@ static void select_dt_from_module_version(void) switch (get_pcb_revision()) { case PCB_VERSION_1_0: - printf("Detected a V1.0 module\n"); - if (is_wifi) - strncpy(&variant[0], "wifi", sizeof(variant)); - else - strncpy(&variant[0], "nonwifi", sizeof(variant)); - break; + printf("Detected a V1.0 module which is no longer supported in this BSP version\n"); + hang(); default: if (is_wifi) - strncpy(&variant[0], "wifi-v1.1", sizeof(variant)); + strlcpy(&variant[0], "wifi", sizeof(variant)); else - strncpy(&variant[0], "nonwifi-v1.1", sizeof(variant)); + strlcpy(&variant[0], "nonwifi", sizeof(variant)); break; } From patchwork Wed Oct 6 21:27:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537404 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPnfk38dCz9sXS for ; Thu, 7 Oct 2021 08:30:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28E028347E; Wed, 6 Oct 2021 23:29:24 +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 DED278347F; Wed, 6 Oct 2021 23:28:56 +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,SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) (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 2FA7483477 for ; Wed, 6 Oct 2021 23:28:34 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LoFKx-1n1EcO0LPt-00gFut; Wed, 06 Oct 2021 23:28:21 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Oleksandr Suvorov , Marcel Ziswiler , Marek Vasut , Oleksandr Andrushchenko , Patrick Delaunay , Rick Chen , Sean Anderson , Tero Kristo , Wolfgang Denk Subject: [PATCH v4 08/10] include/configs: apalis-imx8/verdin-imx8mm: rename kernel image variable Date: Wed, 6 Oct 2021 23:27:54 +0200 Message-Id: <20211006212757.464740-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:npCfgh5IlNBav4Eg1x3mqH9+qMAiaXj4BD6rg5rk4kjG1JbYmHy RjyLRPFAbt7BNL335yUHamSJymKaH88tUH5aXTKA4EumgFXq04BqJ9xz3jcQ2Nituh14rnx QTl5ijVK3ijg/Svb1TbFevW9hac0cC9K95ovrnwmxNBi+GaGHlXzqtsqEEqtYJyJDJH/xFI nqgd4C6nGTMozSLVAnKdg== X-UI-Out-Filterresults: notjunk:1;V03:K0:dARq3rVhfzc=:vDaf9aK7RzqF4pWKZtAHPB H+XhXHPV3KIt1rabWshe/MCepchn10FoT7T31PnHPP66ctVYpZ3SzOThwCVgBM+6QR/46l+DT PZV7MeCiSEx7kXPOJjHMA8/l5/h+0TLRBS0nCb+121grspEtDEQysdKUmeAKW0v8lrgc7Aq9m jha9ZCN/aOw9TMicPSKboySUWoZ+X/VHGyg8dmgB6/kTyPmXzCHP4OSRLpTnDcKKA9yIvPZWw CUE/1hbFuFL3QvwgUd2/77Bf+UHrR4vEaGpBo9fmG3Hr6Y++RlFPhYyS41SwbAzj/uae2yp00 7ryDFKwbv/7J/zy4SbE2TFIusBE0HMS7eVNbXFzQm+FjjB8Wxc267Khj6y/bYlr1AeMc2E8dw 8QzANISGm0PfyLt344dGL42wQEnQaAcclMjPxJdEpLr43lkpuZuAjJ591cYoAN57RHqBXqCU0 vpS+kYDKo0cMJUFuPe9CpdqBYonPk4U/ikJu5tbdep+b0n9gfU1dbkXnWSbXoZBl5i9H6zD5Z lgBeyT2CbFOlDi1jd7BBvkh76p55Z2ssQFCHBFHOfWkMf2E/Ol34ojp+QQSfUevrPxm/sogM8 qn5NsybIx5XfxbcoglKLveo2MTy1wj3+nhHK624ElCSH6uaetzIQGIE7ld2kIUsbHfrb2ZJUO 6sIBRL5HNFvQsRUeIKVlaRkLOh5tOyuiZyuEUqvGuJTkqG+Dqeg3N73v4KpLVQNySKNm0XvSb 5garNaBtcmn6dnunP7+3aILh1UAsUzEq8lFvoA== 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: Oleksandr Suvorov Variable "kernel_image" is used in boot.scr script only, that sets its own default value to the constant string @@KERNEL_IMAGETYPE@@ in case "kernel_image" is not set. The default name of the kernel image shipped with BSP 5.x is "Image.gz". Setting kernel_image="Image" as a pre-defined u-boot variable breaks booting systems with modern versions of boot.scr, whereas renaming it fixes booting with modern scripts and does not break working of earlier versions of boot.scr. Signed-off-by: Oleksandr Suvorov Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v3) Changes in v3: - Fix patch. - Add missing apalis-imx8 part. - While at it update copyright year resp. period. - Fix closing endif comment. Changes in v2: - New patch allows booting recent embedded Linux BSPs. include/configs/apalis-imx8.h | 6 +++--- include/configs/verdin-imx8mm.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 80594548877..ce5681499c9 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2019 Toradex + * Copyright 2019-2021 Toradex */ #ifndef __APALIS_IMX8_H @@ -42,12 +42,12 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ + "boot_file=Image\0" \ "console=ttyLP1 earlycon\0" \ "fdt_addr=0x83000000\0" \ "fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \ "fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \ "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \ - "image=Image\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ @@ -57,7 +57,7 @@ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ "\0" \ - "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \ + "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; tftp ${fdt_addr} " \ "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \ "panel=NULL\0" \ "script=boot.scr\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 50c808383db..693fd6907eb 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2020 Toradex + * Copyright 2020-2021 Toradex */ #ifndef __VERDIN_IMX8MM_H @@ -54,16 +54,16 @@ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ "bootcmd_mfg=fastboot 0\0" \ + "boot_file=Image\0" \ "console=ttymxc0\0" \ "fdt_addr=0x43000000\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_board=dev\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "kernel_image=Image\0" \ "netargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \ "\0" \ - "nfsboot=run netargs; dhcp ${loadaddr} ${kernel_image}; " \ + "nfsboot=run netargs; dhcp ${loadaddr} ${boot_file}; " \ "tftp ${fdt_addr} verdin/${fdtfile}; " \ "booti ${loadaddr} - ${fdt_addr}\0" \ "setup=setenv setupargs console=${console},${baudrate} " \ @@ -118,4 +118,4 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif /*_VERDIN_IMX8MM_H */ +#endif /* __VERDIN_IMX8MM_H */ From patchwork Wed Oct 6 21:27:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537403 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPnfV6hbmz9sXS for ; Thu, 7 Oct 2021 08:29:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ECD6B83484; Wed, 6 Oct 2021 23:29:19 +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 67EFC8341B; Wed, 6 Oct 2021 23:28:51 +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,SPF_NONE 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 886CC8340A for ; Wed, 6 Oct 2021 23:28:33 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LllQs-1n7ZDD0Hse-00ZO9q; Wed, 06 Oct 2021 23:28:23 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Igor Opaniuk , Marcel Ziswiler , Igor Opaniuk , Jaehoon Chung , Marek Vasut , Max Krummenacher , Simon Glass Subject: [PATCH v4 09/10] verdin-imx8mm: use preboot for fdtfile evaluation Date: Wed, 6 Oct 2021 23:27:55 +0200 Message-Id: <20211006212757.464740-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:nk+PAZLgS+FsGw0RTuxKcq9f39XiXBz9HwZ9m1bSb0xmy5dzHNc aUp6M8OG1Jdcb7L23RUyjFFbbJkLCvBuq6MG+SXT2IjndJhGQAGs5LZRCFGTL3qLzOw0qeB YdheM83QEYpn3C8QlocR+/tqE7QHRca1iQd+dU1UBIKADWtWdxobKZL44qQIa9vx4A0m81Z krE2dt9OmBYZmBL91Ah8w== X-UI-Out-Filterresults: notjunk:1;V03:K0:mauaYFlpfZc=:Yj45ccf54Hfq8s9QROMB4G 4L7FFTpAHYBF0V5+ioVFmQlqxLkUXGh17yen/ePY6XDgRYE1vF7q9334SRXncvjwPRKFIw709 vqErQscJlbab3N2yvQFKo0YChnqR7soLtwrMbfwvd5x/8UU0JUMbEcP6OtfV1TFJuXHM3AWyu x2OKWnreUaq96bjNfhqgJrcj8IBc90HsybVzXVhvjsXm5AmtjzhWZMak7gIa8JpvHBQavDoym YNsIVRf4t8LEcBuAr9aGMc04vD6WjugDIpUAgqJzyCqH+D5YPaL+ZvGzv7Eo7h2zpq+JB4+5H UCu9+g5mnsYeV5y5pVu2KarQjvlPG/kCEpYgZ15kBKF2s1Tic+XoqIp6ApRnYzZIUvHEPkIHI zpTxMroJPcDo8BPi1spQVWhgK6aPWHkBbWbNwmd2Iftts/sz+N9iB56a44pDG/t+GMCrLVXM7 Defsctd25fGYR5aj4RxT4qibjwHDP7CF2lYtHiMtA80gfcjAxYcMdQ7xJvnGIEB92m5z+Z/VV n5fXFAiEcNUVsH52H0HtmOZA/ylFaIc7ntXcMBrfJ1B7U4IXNMlnhoPafIno1zHCy76bezGzS VnW6FbLwXT8UnKIDWNNgrsq+FMA/7SPEblx6GVGJkwaMkZe9z7n5S5+sHIdhG/8P+vdCDqdjY 8InUbXzCRGUosb76zV+dM8245TLNdzuCCutjkp+0RneVZ08ks2QLvFjnLzrjPUJKz9SprGJs3 IK1xVMFFyQIQ7E/6aRgcld/purJUjR6t8JeOBg== 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: Igor Opaniuk Enable and set preboot var with fdtfile evaluation. It will be checked and run immediately before starting the CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp. entering interactive mode. This provides possibility to use different boot cmds in interactive mode without manual setting fdtfile value, as it it's already evaluated before entering interactive mode. Signed-off-by: Igor Opaniuk Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v2) Changes in v2: - New patch addressing dynamic fdtfile definition. configs/verdin-imx8mm_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/verdin-imx8mm_defconfig b/configs/verdin-imx8mm_defconfig index ced0d0acc37..ed14ff3b114 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -26,7 +26,8 @@ CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y # CONFIG_USE_BOOTCOMMAND is not set -CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-verdin-dev.dtb" +CONFIG_USE_PREBOOT=y +CONFIG_PREBOOT="setenv fdtfile imx8mm-verdin-${variant}-${fdt_board}.dtb" CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y From patchwork Wed Oct 6 21:27:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1537406 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPngC2Q3sz9sXS for ; Thu, 7 Oct 2021 08:30:31 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D1E548349C; Wed, 6 Oct 2021 23:29:34 +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 39F9F83323; Wed, 6 Oct 2021 23:29:09 +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,SPF_NONE 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 1A00383404 for ; Wed, 6 Oct 2021 23:28:39 +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.toradex.int ([66.171.181.186]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MQ4G5-1mTXlD1Kux-005G8n; Wed, 06 Oct 2021 23:28:24 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [PATCH v4 10/10] verdin-imx8mm: fix watchdog pinctrl issue Date: Wed, 6 Oct 2021 23:27:56 +0200 Message-Id: <20211006212757.464740-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211006212757.464740-1-marcel@ziswiler.com> References: <20211006212757.464740-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MdR4AI30TK0rSl/sLpb40Z0MgTzdzVaeFtc92mSPV+4Tk0TEZpN 4HoTTGHtCKEizGAnbrnq+Y4Q02d5VhF7PrA0I1mJetW+J/SyAcbOioBe5Ogt75/Y+gy8X8q 0UuwFoJvKV82COU8vZojtfKHAigYP1NOkxPOpjBWAIONB5VR04/vSJv7kqntgKN1FmmN5oh gfyfdF+oOfcAAF6+kQIDQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:jxNjGBBQxtU=:SLmF+qLMZSp2ap3HxyZPw3 ddzH5UQOC3D8LWiCTky74bNuE/9OGYrNpSFROxh7SP2+sTlN2mlGKU15N/3ZFtjuWxJKZox07 BTDnB2Js3kxG2hRJ4ybvof9MhuSf5xMHsQjqEjBHmulOj0cJzLhhnYICvItgE9C2ZwQPdYCGi 9jA4TtHAixl3cMzqw9+WOVT14QD1KOqXldhuWqeSVmlZiYYbzqDwkdcHsBlAGjoyi7Qk/aByl Gcy998Omy9DZdkK+pyDCT156W1f+/FqufnsXAKkCZQs/G56xvi6joy646cBpvU04ecbh2yFPP MDUtLpjeIvIgBiC4iwsxFRtU2fyx4CORrZyWBowVdw7fObxoZt91hjVQv0wTMGoivZoJ6AVEG 6TGURRz7iHnmnNIB0jrF56WqOcxknNdDwNY8rAJdXk3wQLWUCu6WMkWy5RiW1hAbIwZaTeZg2 x41ha+PwYlDDPmu7mOTb/Bzw9PDk3Ui+I9/nvsTZ+WkHXYc/HEXi0G2I9ZbYEVHDRARw1DWAc 6Unqd44z+6I2DUrsR4+TpCWE3ZmJC+wWcaDPIm/8QEqyhKDzL/C/TdmfI+Cbif6wqis9avwW6 aIJrzFreu9IoDBihfx+hOgfPk2wFxHei28viiBBVKJrmsQqHrSSOi231QjPNJpLtXrjg6uA6I u00cLBqTcE0GlFyVSue7EgspX7u4YHBVr4efNn0hlrzHsq/SkffVCFUQnHlvaypSRktdGQHvX 0YSNZ/M1yp8gToRzT3fF2MqR6WRCWPokMsOO6g== 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 Finally, found the root cause of the issue already once mentioned back here [2] which caused the following error message during boot: imx_wdt watchdog@30280000: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19 Turns out while the watchdog node itself was already u-boot,dm-spl its pinctrl node was not which caused it to be unavailable at that early stage. Note that any and all other boards I checked also seem to be missing this. However, I can't judge whether or not they might indeed need a similar fix or not. [2] https://marc.info/?l=u-boot&m=161786572422973 Fixes: commit d304e7ace3a6 ("ARM: imx8m: Fix reset in SPL on Toradex iMX8MM Verdin") Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam --- (no changes since v2) Changes in v2: - New patch fixing watchdog pinctrl issue. arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi index 0c65070cd5f..bf47930c36f 100644 --- a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi @@ -68,6 +68,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &{/soc@0/bus@30800000/i2c@30a20000/pmic} { u-boot,dm-spl; };