From patchwork Wed Aug 25 15:14:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520819 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 4GvqKh0kKZz9sRf for ; Thu, 26 Aug 2021 01:15:20 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C26C882EA5; Wed, 25 Aug 2021 17:15:10 +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 321C482E3F; Wed, 25 Aug 2021 17:15:06 +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 8DA3082C49 for ; Wed, 25 Aug 2021 17:15:01 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M9IQC-1mAgKq1FnS-00CgYO; Wed, 25 Aug 2021 17:14:50 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Marcel Ziswiler , Ilko Iliev , Jagan Teki , "NXP i.MX U-Boot Team" , Peng Fan , Teresa Remmet Subject: [PATCH v3 01/10] imx8m: clean-up kconfig indentation Date: Wed, 25 Aug 2021 17:14:32 +0200 Message-Id: <20210825151441.485419-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:YcLXCk/s/m9eKhx/C1V0STpsdGvCg/ehapsNrGkSO64LZN0C+hE UIj+DvywsrkBzb1cazxePKO7StMlfFLtPR7MTMse40pUDBUFP+hn2pFis3K88bg8AQ98o9Y 1zRf1gFNNw6BXDBz4RSE1wrSqd2K0cg5TqXyao65HmhGEfqceDOUcEoPEFLKBePTZEVO2/8 uawqniI+R9tVk5U3xHJvw== X-UI-Out-Filterresults: notjunk:1;V03:K0:+X2/8vzu5Eo=:BCcaOeWd6rm8SmjaIT3xrm SZ8ZYSfN2kCXyDjJ2oDGMeB/82fQi909lEWIBhea1uvb+0L+4UHRqrPdxfe9Zbi42QaaQWYXY CCW32Y6Pexz3mq792749dm0yKOwZCVVsuRZ4UGnlw7gTG9RcFphR1GnpiQcaR6MMhwsHolzVM 4bbn2OavUoPrWgEI4StR62211MwWt03k5bAyEpuRtWI9NdVXxCa3M4AHyDTMzegKN5jWwroiy ySotpH/SvtmUh/7WC5ntT19WiUVt+8JsZ0HIAQW0BGQCcIkTw/uMW19wbc+QppSvi1IpFJVkQ gJhZC3g1V8ZMAuPOhZbigR29NboE+FaGFSiFbcSICwCbcl8NsVEFQG5Zv4nSuOZPCf/XocgR3 XIIrMv42C9fhD69kbAPOjdwt814KfF6WLWDU0H6DJZluYgUtZmACZhNN2BCZkM+oha//e8Qfb 0QrdvRTp7m0qRXKSWwgWiQR/7wlIpcByLCbZCnvZ7wScWNhqiqikM1W0A9yw59owO9MeaHACb z89cGbGs4oMvqcy7GIOUP66CjUKEsFvd3pQbU0oOfw/yPby1d7uuEZ1RvYiv7b9Ymmq5RRePC xFa4HMdsYqlSXCV9psEf7xkqn5K2nGxWMhTx2VMTUPs0QTNo9FvTXuMFGqz7H3xDebvlFjVXe +jnqXNP5pzFc4i1RznrBruMMTwYHqcOpUF2TsUCwut2h1s7tM/pftAu8OGJpcy0PEcHREJ/0G dW15RxAvR3DZ4gLW84vOj3yJ4u+pGBnveNqjkQ== 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 Aug 25 15:14: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: 1520822 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 ozlabs.org (Postfix) with ESMTPS id 4GvqLP21frz9sRf for ; Thu, 26 Aug 2021 01:15:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7D5DC82F4C; Wed, 25 Aug 2021 17:15:46 +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 10CB883140; Wed, 25 Aug 2021 17:15:19 +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 6B98B82DBA for ; Wed, 25 Aug 2021 17:15:08 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LllV0-1msFQq1CHw-00ZLb0; Wed, 25 Aug 2021 17:14:52 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Marcel Ziswiler , Max Krummenacher , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v3 02/10] verdin-imx8mm: fix ethernet Date: Wed, 25 Aug 2021 17:14:33 +0200 Message-Id: <20210825151441.485419-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3R4Kxk9Qrt0zBu3vTYumImhTnkGeZRQTw9uW8hkJ8tVJ5PC/KOC RhMWCTvHUWKMMjCA/CamswPHuWjwLb+3X0HuyouL8bbzQ1XvEP6pzVp1fhDWOhngGalHSTy dic7hxH4gEHwWfrruEHQFrf4sDEVOIx+OWwsFyOc2H9Ofg/NdHdVgImFu14tKFZYo/oOAzR tAHRqEmgfy11KbTEEgQMw== X-UI-Out-Filterresults: notjunk:1;V03:K0:T0RmqitfQjA=:JBE4/V9tRr6tkxhN6dyZzC J9V3lpW6t61AzTJX5eJ/forLcEykXlWQNCugo9ZQ8Z0GKwsLZ+UhJo5yKpYmKdMns8KrDnohv Z+WGu9B2uuYXdzItSg79ZmFnz2zktYIQZmCnTY13B5B3e8Jxy0dMtch+w+nFTECop67bVEfsZ 3rNmxhsLQl95VYVoVwJ4nto4iF3i4JSf32G3G6SmFQpoRZAbiJLwQFZVt2qm7wMNUqcIoHMq/ ajea0ukKBrrlkENWU3QUP+0lCkwLJ6WCDZOyKKaKqm2T/TNHoMPW0atr8AsVoEQU4B6eg6MKY FIvOPfmJryVQJ4WqONg9WiyEMgXMSmpdUB4EH3BM6jj9ROO3U1YeNZBfTh2+WDL2S1ojOu4y3 ulT5shZeDxUq1zVrRpV78245Glg/31yueDsrjI8kwsmHc3YcySaFEVvhsaLrVfPDAWo25gAd6 AJS/ugAn/4rFsOdwUg+Vep7s8c9O/XjsvFj6Fzeo6FNHYOObRkP+PynCno0negxb/YxpL0lPc bvQD1kNWMKOzx5IFe3IcCcWYrhAY9bXWuwbeOqAULkxxENowSM8BNcyBmg/NNTtrIfi0yS6TF EsbAzvPH1/CifZ/PEEZbojxQSiUpfbx0fLly0/88mJqJ3IR0YEJLxnNkfpFDoCGv5WdZnTYA/ bw7UrVKzjR/rb4a1urqBnOdDMJrjDtPc1xy7CFonS70cqbnQbOYzPdWEh0WjDWUx2kTQufgrP +qWYJBM3NsY2X5sK38yi1jXTSDVzBgdHbGbFtw== 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 Aug 25 15:14:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520820 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GvqKy4Ls2z9sW4 for ; Thu, 26 Aug 2021 01:15:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 91C6F831BA; Wed, 25 Aug 2021 17:15:25 +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 A53C482E0A; Wed, 25 Aug 2021 17:15:10 +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 6BB8D82E68 for ; Wed, 25 Aug 2021 17:15:05 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MJRQT-1mKpM514CR-00323F; Wed, 25 Aug 2021 17:14:54 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Simon Glass , Tom Rini Subject: [PATCH v3 03/10] ARM: dts: imx8mm-verdin: prepare for dek blob encapsulation Date: Wed, 25 Aug 2021 17:14:34 +0200 Message-Id: <20210825151441.485419-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1k7+1ew7HYcvOwaM6HHw2ve79V6QDUUVUWMLrcXhWwOWc7bB5bv 57l7b96S3Z0vtYEq9U6AqiiCPj/qLJJ/wx2XET9So+vzR0R84w+A/ZucylQ/WGHMsMDzrZw xQN5Zxq0qvo1MhVWyxUxHv5NEI17qI7D5xHCF81mMFrPUgv4gg/KQQub4zjd+gvg3HEJHCh 5BNskzPo0R1LZBij3Sdeg== X-UI-Out-Filterresults: notjunk:1;V03:K0:8wjN9Lwpro0=:qvGyE+0lsliiSzeBKXhSVb a6S6ZswKPbhwBSHj6XgPtmoc7WgMafce8djStgtIoNdzP1c6ZRo+C4/r9dJ8RrbeaN2FG4t0u 9tkUfb/+7TbcyN1FvJK6jIeFRmzs3fO+YImvC2mkQDqrROtf4Dh9pIO9F2pVGXMdAh/NNc5C6 AbSqV9H3U2hY0PoLkF0naoN0qkLP1z1sdNdzUgF3qDt9l5qBNbum+VxLAAuUnRoWHQ/SA1go9 SyWaB8legQyfrm1e1qbAEVVFdTpjYriwLQk5GDY5jqzn4bWjoY6xdRRIxRabsuQaopCVMQCPZ painwaYrxXq4MUX/A9tywp1WRlLGMqIZROLMa1A5vj3liRKYtASDCKE2RVlNNY66gGIuPQCiA R47OO8tHu9Uq1Ibdx91XVOwm5Ywlt75joJA5AOrjRi4AKLX7quJWPAyCjrnl15Lo2qqiPj37d x8eyYVRl2hSNdoW+9O4GlqvFAydxfpwRXYfkLCcR2E1p/ZAfh02l/XSB7+KDAa7Et2faAE6Wg 6H972bYiuFUY8dLWpZalhZPk/XDpkRJcrNo5WrRIvuuK3LKKqAp8wUPS0I5qU6Oud1V78rzC1 l1HGUa28KnFWM1uaYJTW7ywQrIWzGc9+OCfPev546QtYoApnIj0x9ttWMrs/4UpuNLJexWED2 eNJ90HXEyr2fQGoQPNIqiUHafqCB6Vza37YMBfNdzuAiEo4I0HFqqPoJgETo30X+etXenYvGn +wp1RY746ZdbEaV6wE+kwZ5ZEUduGQ9i+gbOMQ== 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 Aug 25 15:14:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520825 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 4GvqM645Hhz9sRf for ; Thu, 26 Aug 2021 01:16:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B53AF82ECD; Wed, 25 Aug 2021 17:16:00 +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 1075183125; Wed, 25 Aug 2021 17:15:28 +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 5D63C82C49 for ; Wed, 25 Aug 2021 17:15:08 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LwsP8-1n7aPp0o4u-016SOg; Wed, 25 Aug 2021 17:14:57 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Marcel Ziswiler , Heiko Schocher , Igor Opaniuk , Ilko Iliev , Jagan Teki , Marek Vasut , Max Krummenacher , "NXP i.MX U-Boot Team" , Peng Fan , Simon Glass , Teresa Remmet Subject: [PATCH v3 04/10] verdin-imx8mm: switch to use binman to pack images Date: Wed, 25 Aug 2021 17:14:35 +0200 Message-Id: <20210825151441.485419-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:clElGBeFwG7SVoC9m9wTFyqG7QpEUbi8uA6fMtsv+NbwAh4Ae/S CBVBn5rVxMtQbAiTJYpJZ/8mFGYXBxPeTM4MjLOstcNwy8mVvyCf7DYAuiENCS3MEU5i2x5 oiRbAm2+EqeAjjadMfVl/YuNISQ2YZGC8u9wdVmrGpuM+n0uoN8sQoHzHnoQgxDPD0yIhLm j26HUegAyQb5JuCv5c3ZQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:FHaRw8JiLa8=:ha54Eb6HsVzW7vATny8IIH SLY4tfNVqGURD8DTuBh4GjiKHxJRWOOhllBW5m3mbhVI7rPCWL/RsIVHCvMYRHXdG0QqHu6Nw +oz1g6d/LbEtOGvri+mD1Jr+l2svDRu4WQFYkTFtgwGuWNR5pV7P3Xozn6TIQJnuxTELh7Kkr yU4WXA4cmkhYNdroiujnzZMTGdWQdlhSoE10iQsBzkRydt5resxzpDa+trjHQNRGiEBKMqzfh mRopJBo3UeSZBntOlh2BuIUUR0yBJewSsorASl4tWEXryND/v5AN/tfkGLV2DuR3WN7B7h2dT 2ORSEI6OvuJ+kFEu4ZNNGxkQQcewvaXIIC6/L9v7Pp1+EJ1pV7hYB1qpq9ymYvpr2ny/DLzuk 61nvv4DH9iDBk4wJmo/Msvnvv4V63c5jRpAS5b/j5HeJAJZGOzxee3jAiofxz4JsG/m9oLP2g ZT0AD1RBGl2qb/R8tnk5L8LQnjVXqiX/rxWJx8/o5HSUh4QfdRx+r9P8PgfCoIc7/BScKoA1W A0xwcegDlvjlRiWxmIbNiVlRqL57XrRsYdCLI0msGkDQFw1yGp70i5SGBNxA0myif2r+yFqmt XNID1x2aaEYPrA/CK7zg0/TExsSuHYWRk4Jv71YXM2N7nJUfF22HvpyfO/VuaGP7vvT7ge9iF seViz07svajrWKQXtb8+mA68l5m23xcbIqW3SnasGtWcYikvAW90h7Zg52DzRVX1cXhbxQD/O hzB33BQYdQF/FKplnwv0pF2QGyFdV1NCTMvpaw== 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 --- 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..0e041865021 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 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..2832e6ec029 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 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 624f1b99096..b323ceb19af 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -24,7 +24,7 @@ CONFIG_DISTRO_DEFAULTS=y 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_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/verdin-imx8mm/imximage.cfg" # CONFIG_USE_BOOTCOMMAND is not set 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 Aug 25 15:14:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520821 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 4GvqL8348wz9sRf for ; Thu, 26 Aug 2021 01:15:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E7C582F2B; Wed, 25 Aug 2021 17:15:40 +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 4FC2782F03; Wed, 25 Aug 2021 17:15:22 +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.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 D123382F03 for ; Wed, 25 Aug 2021 17:15:09 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MOgc4-1mLddV1tTy-0064qi; Wed, 25 Aug 2021 17:14:59 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Max Krummenacher , Marcel Ziswiler , Igor Opaniuk , Marek Vasut , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v3 05/10] verdin-imx8mm: enable sleep_moci output Date: Wed, 25 Aug 2021 17:14:36 +0200 Message-Id: <20210825151441.485419-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:G6VRfdEgQI6FpRMG4mQTB+soJQxYUothY0YyiU8Lt2lq9vtTuX6 1ZHOUV+eeabbU1yJGtqaibaOsYd4z5TH5cfHkdZMnnQJ080JulJnv7AJJbiSlRCnrwzq13B XFib7BCWdz+KEU70GBuKoa+CV9LAuDkJcXF39n/gXVchN98+mRRfF3s9K+PtqYOUT/L1HGu +OGbpXwVaH7aJSd0f6Dyw== X-UI-Out-Filterresults: notjunk:1;V03:K0:d1s9KjNzQds=:/NM1gNkzJugVdu/q8SXKbs TDxLiie7GUb3eNz82PgyQ6UpIWKORRFMgVFKr9tG2imoKV3Bu+3MNSQJCuvCqeHY6sYA9MCvC Lt4QHq/FvvIjyifSvkVjUPOc7nU43GzHeHugvLDmnA8TEDlRbvYe4Vg1/vbdixV/vEE1zSq96 7oNv7azF7dlUopjCT0sv1VKBcMjnZZiN5wwUgrH3JVyLKwunfj9u6P/nGqOpIBmpddqQJSFuc 4bqhq3W0s/YmPYrdzC5FzRaduxDFKfFBHGuBvQfH+tb6M23pInK+wm1tufUiuBzQTdDJgMrYl +6NV6njVAlWHp7fh4LZN5tqHYOrYWTwzONimw85PZQXe3fQtDekZvvJgXbB/06wS19RuYH41t YXeX1woSVk2vzBE4pn0SCmEsmQO4afAfef1ogOrfJAV5EmlcPZR9kH5H64TrXhE7WChtRQANk WmZOUqOHnUEe/ayEVK7o45BwHvbSmjb0Q4gW/o/3vbC4Jhg3Lqbg8OJPW05JNgXW8OTAvECyn BUX9/htk60RXY/z9e40xk+UxhnZ+NUq23gircHKCSrCmLAoAlRN6cXYDIwupTuOfGa2jaaWCH iTbMV5ifDFVs9y7kusVXI2AY0uxVvT5tO3xF4cZnlLwal27pQ/kp64OU5bq/X5GTxxEXNEYMg cMvOfh+ZDhQ4SjW4zOKggHg/hZiwtq5ULj3WM1vkT2zLc9uhmR0iGdsArYUP0VjWwTGhDwqQR gXmkIxwMewtijSj6LFXbqgtyV6g0Ch9/c4vAJQ== 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 b323ceb19af..ad9c00a3cc4 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -71,6 +71,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_SYS_I2C_MXC=y From patchwork Wed Aug 25 15:14:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520824 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 ozlabs.org (Postfix) with ESMTPS id 4GvqLt658cz9sRf for ; Thu, 26 Aug 2021 01:16:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 87A2382EA5; Wed, 25 Aug 2021 17:15:56 +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 4753282C30; Wed, 25 Aug 2021 17:15:29 +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 EA69082F1A for ; Wed, 25 Aug 2021 17:15:09 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lnh2P-1mxRQg1b8Z-00hsZp; Wed, 25 Aug 2021 17:15:01 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Marcel Ziswiler , Max Krummenacher , Simon Glass Subject: [PATCH v3 06/10] verdin-imx8mm: clean-up include order Date: Wed, 25 Aug 2021 17:14:37 +0200 Message-Id: <20210825151441.485419-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:BDvsNrV8YTYOhAyi+dlIbq9+hYdYzEebWqeUi8EC2iNY+zYpo85 JmzZ/dpXdVGRc/tcwqnR9g7QL4YORY0KuxCQ6wMzF76aU3i8dPhksYTz8S6ip6udf1HPFhl Z5jwaSgmLwjEUPh0q2Dv50VDrxvDZgYWkWwzzYo8YpEdFYwuUcA7jH3KzLj1eo+ez0ifA4o wvcUUsRvPVPN6bDZmNgRw== X-UI-Out-Filterresults: notjunk:1;V03:K0:UirbDabei1Y=:xvOrl9hCnoVs465587WzQ7 fZf1TLJjghNOu4yQVlVuW1Wtsf1Uo9J68PuV0p+SfeIqxCJ33IE+pFVg2A/tjgFZHEDqvHzrP kea3d6lYqCO0L6e5fDYc3bMSQbOjYydN8vptcYn14oyDM2dBCkMHxDnA+E7i27sW6Zcl4d2hr IQKAWVsSz3v9LoH5hJ8yX4yYwKmfTcQqhxKGnNBDwCxugdbfQ6u1Ai2QXLNT/0TlLntoYqP3E 09BLTyKEDqb9m0P6+jjG3sPvYH93L5plb3H9yncIAuOym3eZ1jfCItFA9my0YFdHEtaH7wEex HLg9IIm4nmfc8LGTZEyDqU4BnGWo6GIRtK0sHzMylYq1Ncn8PhUV5DjqDINnJP5ouW/DbB2Oj CJJkhEcz69TGwOKEbV2IB6pEaSd1jh/NJsGmXpNg9iIBeg7IIb9sRS0NepuC45yYGvcCoN95O Ub0kKOW1ZdmSDcNg42PKzZ8LxQlTOK7noZsbhu1jsAEpGz/++EuNPvZPythKFXokx3L2BdDsU EApgzNgIehJwWB3x8XOTWIzw5KO1UeeMqEfLdLORmD6Gyk+TzmRhWq2Y85HmLhNWH0jVAZQFq PBgu+xzz+uMPQKeMDj5+hSvwBh86iJzbrnRacZpOdr92fuCC9UkRmn6UkqnCA/sIKoZL+4BSI LK2Gc4YXgu6SxuXyreyWJu+FQS1w1+3W+fx3wIJVodBje07N96jQ+0sYqXMP88UTZ/rvbxxA+ A4n9kbhGx6/VkxcQmG/XplcRY8a4DIqBywvqDA== 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 --- 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 Aug 25 15:14:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520826 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 4GvqML1PKXz9sRf for ; Thu, 26 Aug 2021 01:16:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4B23283118; Wed, 25 Aug 2021 17:16:08 +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 13CDC82E68; Wed, 25 Aug 2021 17:15:38 +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.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 4F4A482F34 for ; Wed, 25 Aug 2021 17:15:10 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MhjbJ-1meY441XBj-00MvRZ; Wed, 25 Aug 2021 17:15:03 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Max Krummenacher , Marcel Ziswiler , Igor Opaniuk , Simon Glass Subject: [PATCH v3 07/10] verdin-imx8mm: drop support for v1.0 hardware Date: Wed, 25 Aug 2021 17:14:38 +0200 Message-Id: <20210825151441.485419-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:D82KlhhPVu1q4h/fprqXE7ctFdgmC0WT3FU1HjinTLPx11nhFT6 9R8o4wS8mT0UWMk7BU+wCusXGJ2csuV4l0fpBrpig3iEVn/LbHK3BxEeuTC9eXv7XV+z5lg UDvoaFlthdIRJRN1bUXUFzUorekhnYXiLrw/j0cH/psvRwhXKoE8CT3Q8uPen5GumTExqHh TZXKOArpnrjtsQSoSMmRQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:tRv1HLLdhWk=:ME3t3FlW8wkDkQEWnPDcS7 FnNALX2qrwuuZqagY6nqvfokAmPTMrfR4BYjdf2xMrayO/GdkRbUM3xzSu6Q1aqx/hKeMM8rO lRZaPB/hKpcegLREVlO+VTzBevzziLYrVDZnD7wDIShNkYm+RIhRUNp/7I+SfrmbGEZisqd6i 8TszlHcKWI8rSWNI452JhvNv9JPz5GV1+24JcPqESN2g45cNq3LMOEHzyOJXIH2LmcqffmJsB Ck1tkRaN/HeXA8xMX19daPdn92i920fI/YwzwQ8TSYfDDkvNHPUK6p2V/224ql6Q5WPq+o5It xwgLbUN/kPVxbzG8YN+g9tAEUBs1RZiqx8K9gW9VhNo5EZfm0MGak4FF0k9KHtdVv/XHEOUY/ Zidb12m0PgDdBXiwLfMxUI/y9YGjFYLUFBt4s6tFc0nTf10zVULmF8wQyungWPr3aDmMXknpW u+mJvRdkTMuiFlhW7linVA0D6+oO7iZKFgAWojTk1VEwJOEQQzUcZnov0XXtDYNbaaahu+B9g gluvEbhHI1i1bVlvLXUBRm3/rnmvXDHZ6lyDS+6fygq8fBLunF6G96kMLNMuqXjvaxcYzAozz NE5gqTyOQyvC//z+xCrrTL9GZtUIfxfo+vpZMUavOAudrF6Zj7jqkKj/K//lNyDjEhSEv7MFU n0UhJpOPTwKQEVGP1GF80W4QTL7y7XX6JZLacF6IA53mxTyClvBB558encAuRcjb/jNOmb6Nx 1Mgjng5HN1mHI5+sSFWm1o3IMlSwc+QJTGBPCA== 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 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 Aug 25 15:14:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520829 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 4GvqN2546mz9sRf for ; Thu, 26 Aug 2021 01:17:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0A3DD83163; Wed, 25 Aug 2021 17:16: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 2FC7D82EE0; Wed, 25 Aug 2021 17:15:48 +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 5993E8314A for ; Wed, 25 Aug 2021 17:15:18 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LyWpM-1n3jrj3VEk-015uhI; Wed, 25 Aug 2021 17:15:06 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Oleksandr Suvorov , Marcel Ziswiler , Marek Vasut , Oleksandr Andrushchenko , Patrick Delaunay , Tero Kristo Subject: [PATCH v3 08/10] include/configs: apalis-imx8/verdin-imx8mm: rename kernel image variable Date: Wed, 25 Aug 2021 17:14:39 +0200 Message-Id: <20210825151441.485419-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VatUKx7DtJBI1nT3vD+TJFapSjhjqvEKFavj2Z+bnBKcW18QRvp RQL7UQJENhPWOu3yg7t1yqDP2sBcdV7KutjKLSVcdlTCMVT/iXbs2pdeXlC99giFEY9shuF NQqFLgfkFHLm7zKr2HjnwN4WeNh6C0O7lK+6ag9WTiK7YvVIIntIlWY5N2Zy+veAZnwTa5y +dA2cok4VkVtrgs/G6ouw== X-UI-Out-Filterresults: notjunk:1;V03:K0:aYqtFZshnL0=:8vN6QSVhMK1LLJenXqIONe ZTS5yf1SFgIvZqX7Mg0zU33ZMhiO0og6rTwbG8Q4V1xA7av6Eylu5SpnT4DKVjjfsVOA9dXfj twnU3L80cpgavgqUzjo2rRzCTR/QSZHsqx3bPEwAp2St5gaLPmNU/A88wLmdfXcRL2j6hwzs+ CGW3CGINU8scJovo1TEPafGd7UuiAlGfPaU0eDS58wjeQlfjW6EN7tTEE536X07UEu16EhSh0 Kgue0Dv9GAUbca7dZL2gIKirb6j6avxkDepq+lI+jKxZXP/f6bDiMo9CZH2Ww54qRBe5JXZhp OtITG8Mvm+QyVVFUvvJAKolo4TLU/KHhXiJwzKsuVcLyvmQHnHojOOBf1yjw1R2wdP3ttChl6 GtFZDSZqUkYyRrSjXdN8YlUtr+SCo5HTy3noMmL/v36NnHRPyw0DU1e53KyvOT6Vvay4Zue+o n0dz7sF9k1GiWF9vNGBBvdbEFEVdNZY9tPaA7/PNb2+YTHxAMO/+F1KHDV8137JgU+rbXVJmY F4klI3PBOAIeTH/Cs5gShzcUL6TzsZERji1vPK2HbuRXjlQwACfZrqE+ETeor3h+wkoudJzMN s81tbn1YxjFsgXW+al7thhn8RvZJz5cLQQf1l0IvItPG62FiM/7AYx7brrwypKWHO5IrBNdQo zwPpDJYxE3RF34IIiZDqVL/D5rrJymtQSKF8nzcx8BFh0QJ5h7jJxnPOwVp28/6rP31rSHjWg zZ8EcvQEEQ5JTPbi5tbNgneR1CsbQ4lbQI8MbQ== 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 --- 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 | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index b04a03f76da..1757f025fc5 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 @@ -44,12 +44,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} " \ @@ -59,7 +59,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 7be5e5ddf11..d15a3e05fcc 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 @@ -57,16 +57,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} " \ @@ -124,5 +124,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 Aug 25 15:14:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520827 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 ozlabs.org (Postfix) with ESMTPS id 4GvqMb01NPz9sRf for ; Thu, 26 Aug 2021 01:16:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C86E88314A; Wed, 25 Aug 2021 17:16:27 +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 3833F82EE0; Wed, 25 Aug 2021 17:15:41 +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.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 E782482E0A for ; Wed, 25 Aug 2021 17:15:15 +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.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M07WU-1nArgG0csW-00uInO; Wed, 25 Aug 2021 17:15:08 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Igor Opaniuk , Marcel Ziswiler , Igor Opaniuk , Marek Vasut , Max Krummenacher , Simon Glass Subject: [PATCH v3 09/10] verdin-imx8mm: use preboot for fdtfile evaluation Date: Wed, 25 Aug 2021 17:14:40 +0200 Message-Id: <20210825151441.485419-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:NWDa4oJ92aUPTau6atFbhCLezeOOeFai7Qs+QugrMzJ26OUag9l gjKy0hAG1b/r24UJhin5YAWc11bvEfJXQzjetXmIBpst37uTQhMbeu5m17dsOb/qdFWWeu7 PwBvnMcW1/5m5hlgm8xvG3SpScyb+OFTceDddjSPpqbK6y4VHeHQJTN8tbzzxFdFcfCfIyw JrbF9FcapeQU92If2ne+A== X-UI-Out-Filterresults: notjunk:1;V03:K0:sq5LLlQ3DBg=:025/5aOIPHicOygLupY5xg o5ZA16IanJFRvyHuyJhb3pp2o5RnFP2Du7nPgNhNDzrndUiBhWWJEsg9XQjVQaMB318j2HRkC TW+L4cDkXq2FWlva59A4nJEJlkscWNHP7GlNHMGfHuU3EhYmr5N70j57VgxA1wOpRRAaVG9cs 6o9WQwtlccHQirc2x4ZSkWCewOZ55hqF8oqL53qTrkUrSQlFXOJfJV6PwYlS/jqUIF8YQemht F+5pk4BDrx/ozTiS+hWi1EZsSNBsnwfunFHgRBi4i5xRiu9Mkg31/LVatajvwtg3epYyYPl4u VwdjI5SXFmJOSsTBIqiMxQVUtHbL9lUmGjzjJ1CZgSE++OL2cnY130ycLeDMXaxdKY3DcjrHm j4dF+k3RKY844aHhRrdrGfNfQyseUnrG6Ffubeo0uVreg48N4yQWya/BcPPluuDyIOLTPp44X 9Sbo3VrlpMO7RFsvkPK7WPT1BpTebTfdepFqpiY7JXX6e9EQrXDrAG5bCLK50MZx1lFX/DB/9 wl+ntJKyfNn9P6hO07+VjJdWjPz0dNYHeNn08dqREuONhJGTf46Bin4J82FCPjdyxme5UwGHV HyhM9j58B6r/G7VHPDnQDFUVY1Va9tBfFxazxHgDGxcnPRe5H7ZtRew6U5hKbOVKhmqYQ2fE2 QFLs1uITl16bkR0wxZw4WpULxwbmd8QaJWv2pmn5ZvVthCGC8lnaGQGmt7ndaF7NQfOnlT4Ts TyY6Juh5uNZD7eIgonBQ0OcVilW7q37FYR7JzA== 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 ad9c00a3cc4..ab549ebbada 100644 --- a/configs/verdin-imx8mm_defconfig +++ b/configs/verdin-imx8mm_defconfig @@ -28,7 +28,8 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/verdin-imx8mm/imximage.cfg" # 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 Aug 25 15:14:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1520828 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 4GvqMp66ddz9sRf for ; Thu, 26 Aug 2021 01:17:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DE3C183129; Wed, 25 Aug 2021 17:16:31 +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 97D3782E0A; Wed, 25 Aug 2021 17:15:47 +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 1EEC48314B for ; Wed, 25 Aug 2021 17:15: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.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MBEUl-1m9JpQ3kEX-00ADZv; Wed, 25 Aug 2021 17:15:10 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Fabio Estevam , Heiko Thiery , Stefano Babic , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [PATCH v3 10/10] verdin-imx8mm: fix watchdog pinctrl issue Date: Wed, 25 Aug 2021 17:14:41 +0200 Message-Id: <20210825151441.485419-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825151441.485419-1-marcel@ziswiler.com> References: <20210825151441.485419-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Mp9vhHmv0enzWWpkSwd/sxU3d324my8SeN+ujgAk+hOb+iKkYDd KII6921hA6bq0xnMAfK7HAU8HCGtEukJmvDAwXbqzVuc0kasJ1G7kYDLekW7lZTONucWaWl g08wXhowUihisKbH0k/B5VC0xVXCU+DlvbD8KYv4HJPmE8y0EHGuEArxvBzs5wcTcBeH5vi iT28e7oid9tafi3SgSkMQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:McaejxwTQYU=:RF0gMEyZz3vNLn1Cy3IekD LTwxcvh3srs/eNMgughvOTSnztGARivDUZXBLqbuF/cSyK/73wwtRRjn1d6aW0aw+ToKo/Tdu fZWTQUGtFbu9oV4HSjP2LEd2z4MiN1+MV9rXdImkoOIwqoqPaVZBNjXTIqTGjUvS/id9ehxgB oj7ZTUNpPEO2Wib8QHSgd+X4SaTxTKdSSaeK8nomQTtexBd1ovetjrxI4w0wW9wq4+wLXUhyS 4F+FX2cPb3x72iTTF2AQHurFf0L2i9rkLYclh1AP6z0znEeYl2zf1ikAprBd2r+ULJ3ujBv1H EOaEIus5Xf2SdGJ37kLrYuldaXylZqbDJxBEv/+15a/UTlAL24e0g1sojVD7ZoinuL5r2QJ9m 5OqhyBppVDKEhp1BaWy/RnbIfD5BNY/rJk2Sqx9FinBoKifgwNxibuVPV9Hra2NjfpLQFW27n WIeVnpGpPrILXY7GIYrWd4IdKMStoeN1aIsY8ioEhzIcQbGOzqS6Cru8+L40e7JuB9Pwaps1A xpPC+lq99mnLIxMqAOTOnCBbXy0XNU4WggXKTPj2MyedWGxgVoaL3Spc6yLACq985NJlpVi5K xEViv7Gkh5HjszMk1sdp5niUfgTio1SNpeR78g2ioqPIr4krI3vN+xbuDeQ7pJY32Nq/H6HxF LsXhv2K+CNRAmbg08zECBGhEjJ3fi7yZ8M+dNyaYFvtdKBG+d4f3NZKsFqnkMeDYpAAi0MHlq F/dQ9nHRbeQ213a0Z/D2R9eF4Xe3y6/ZEVC6rA== 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 0e041865021..6962bb40b6e 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; };