From patchwork Mon Aug 23 15:03: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: 1519754 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 4GtbBK5F2mz9sRf for ; Tue, 24 Aug 2021 01:04:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18EF882D50; Mon, 23 Aug 2021 17:04: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 7129C80FBE; Mon, 23 Aug 2021 17:04: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.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 21FDF8020E for ; Mon, 23 Aug 2021 17:04: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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M238H-1nAHU4227X-00u2Xd; Mon, 23 Aug 2021 17:04:07 +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 v2 1/9] imx8m: clean-up kconfig indentation Date: Mon, 23 Aug 2021 17:03:49 +0200 Message-Id: <20210823150357.247295-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:omTZKQUafoksgFJGsk57voKJUtXhiQ/QJNDGkPuIJIK7ztGKd3K E47VonDQ4G6khzxrEuhpJhykdTL4NNmlJm8OPpwY9mOwfgKD6jE6NguuWF33QsSJpn3qi22 fMDyfvPlkBQS2SP5YDMDa6U0CREVTIHRQ1XNB0zfDd2qv24XXQsq5gThXmfDtWN6dLnDqlM 7rcNCDVsOb1SVjt4wnTxA== X-UI-Out-Filterresults: notjunk:1;V03:K0:w4C1ZODNA/I=:c3IwzVgtc7+Eqc9oKf01VE TLa+KpR6o0Xyo7mlMKicbwKsrm6SbEBmZ/kdQK9Tua+8T2rE0gwtjVLc6G85qkcs4ZI+gd4ar VgVHaCJSdXDdSQWqwyjiWp05QQ6SOpOtX8+Lnft2g8YeOpoomqQ8Q3rMlH4XtrRDK2Mrcu6dJ Kb1+anvUKaNLnLmWuvsmiiIB4rn9qQKcmGI8zdlDyjySBNb/XT158AtdYEC35YDoaG3V+Ohqf jVSmJssK1zRWO10hYw4elYB7xGfmWMxw1MSqfGhRSkH1c7Fdm5SmK6r/fBkE73ztqbl81jOLS c4V/TsJYIAe1xoTX5rzZefzN0RslBlS7ZkTQD0CJP9FYlRt+xzJElPpK+KA3atowtaOPNYLmL Sy10hNydnZBNI4W1ctoYy4yW0zSflnFcW4RMDWQvMWg9IBKaWfB/rD7yllwdwnNe9WyrDZJWN aDGRtfkSYrZPA4X7hOMDC51pz1VFcxo7IsDs5N9Eyyys+9VjsC0zlrGVCnbtBCW+0+/glE4IH xds8p4Q2Nm6iJegyy2PSHwEaQvk3JzgBe0QfAoTHJUee0TFPvMYtedHhX7zYQ0fGuCDnIaaVs tsUhM7Kbb2c/8KUaFZmrNUKEd9lfD1L28Rdytfh8BQF07mbhEnpUVjaS24xeP9ForHxQtGh0m n/uHVLX0fPtx07tR0CyP/axY+WzR8KtkNa/SUKBeYbXgQ9aOIB3HhRd5SqDH13ntRJPbJAZj2 Syqq4dIB+27FWVATn+nuYWXE6i0BMwzm1odlAXep3wovN2gPW2V6Pr9M5QvKISWds78xoZf47 bQ7a2DCmy6esa3U53Kd0CNUYM2BXc1Y5qR3diubThNla/DRjKOjZcNiHMErM6H5tusKhiEv 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 --- (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 Mon Aug 23 15:03: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: 1519756 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 ozlabs.org (Postfix) with ESMTPS id 4GtbBn44sJz9sWq for ; Tue, 24 Aug 2021 01:05:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2611F82DCE; Mon, 23 Aug 2021 17:04:54 +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 17A7D82DB2; Mon, 23 Aug 2021 17:04:31 +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 D4ADF80EE5 for ; Mon, 23 Aug 2021 17:04: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.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Le6Sw-1mq5X33dgC-00ptec; Mon, 23 Aug 2021 17:04: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 v2 2/9] verdin-imx8mm: fix ethernet Date: Mon, 23 Aug 2021 17:03:50 +0200 Message-Id: <20210823150357.247295-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:7h4LUQXzxKqrB1liIhNrRnEGdMDMynfJ7PTgROUtIYfFxrIETqS nuc2RrgHKsWHzogFBwyg/SsEVQzfEp98QNvyvNq8gdLEa4+AE8cU8swqtr2M/qTXLOvnYMW EcsQ7KJb9Yl538UnI4Pe19ZuFeCSXvOr0uxUILLFg3Q8118c6azEm7bPoZpzKhwkz9fRujH Udtr5EElDnTspmGEn+CCg== X-UI-Out-Filterresults: notjunk:1;V03:K0:qxW0/7j5sts=:3CuD1HHWDwK6iPminfTUF4 BfOPq/emvEnRFvxax/3Sb/IbboW5VaJaulv8uVVjJBIl8IUQAtU9z1NOKhbOBpMz7p+EVZ7fJ 7Xf9rY9UUjgmHVyeCGn9kn96rSOVwLTmkgto9vgHpYsvkI1btD9u2jkmoYFc/shWoG2B2NdQT T8DxrOgY4qnaPwx5KY7J0iC7uoqoI9g/7wkFhnoSdWNEGOIsKiQHy0PEAe8HeOSJDHWvKHPvp +qWln/8UFL3fWRrpiGkHfLV7mSXz5QgSnO6Qb+DdSjErUtuSiztWi6SkYZCfC/8ZTxFClbFnF vCoZ2smuNPy0413u5PmbloUrfjlsIJELgW/gbam1leOP8LF4VnvNH1Bk079QTqqwCGXF1FOJU WvUxSKfBA7JtER0c/lW7shPTxnOr1C23wLjYtV8mEkLx9EZO0IZBH4STVcLcUnzS9Ri567d8N DvJ1CtTsCqZ4d6dzwC1metZW1qfIOiqIkk1lE4ZMhub+Y6REPQx8P/+3+yUXtR7g4wTTE9cXS wItuQmJ37OsUsh6CLmqezA/AZVLrR6fWinEfSGU5uQLvGrYCxmzKkEmIuFN86CZYvLMVgWnNB UvsgH9JvNRbRcTkmXf3TPw+je3KmiprsMnyNaUmJJFeU8li9piE4r4LI2woj3MHjHzkgUzxow XpnS331QrSPHx6WMxJbBJwvx+4l8vXZeH3wCRyPDpT7kuectm5D1u1SQ9GNsqkzO3sfxBmG9H oq6Dr4CPaYvVT5AOUICLY2WiFl8LKs5DbwlmVg== 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 --- (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 Mon Aug 23 15:03: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: 1519755 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 4GtbBY6VM9z9sWq for ; Tue, 24 Aug 2021 01:04:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 851CD82D52; Mon, 23 Aug 2021 17:04:50 +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 0534F8020E; Mon, 23 Aug 2021 17:04: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.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 A92D38020E for ; Mon, 23 Aug 2021 17:04:23 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MYhG8-1mUqvB3jik-00VTQC; Mon, 23 Aug 2021 17:04:12 +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 v2 3/9] ARM: dts: imx8mm-verdin: prepare for dek blob encapsulation Date: Mon, 23 Aug 2021 17:03:51 +0200 Message-Id: <20210823150357.247295-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:lu80fy4PQbYf22CiuDJmzLYd5jZJJp4r2dXSEiDe8Vrn1Nsm5zw 2svbegCPBaKdJjFIxsZPQk6DO3J36N56aMfpY9040UeGkcpIAt84BNTdrQ7PyMy0N4mH4EA pagh8MTrj1zoZTR6JC1E9B++IV9bE0JGM/q2OknMRQytlQhgCh8+fgPSJyCZ9PTlhR9E+F2 jaPPCeI6Em7IK3HjMnOWg== X-UI-Out-Filterresults: notjunk:1;V03:K0:8ck6RvFODEk=:3Xv27J140hFbtUeiJ2mbVk LUi1m2sG+PpujHY85OsW/WYOyGk2GxXu/c9BAgHzmH2406H41mWLRARKQrkFzAQ1kAeZmy6mp Dw8tKPlRmdqmOmfBuW/2wXNI/Cl6kksYTpFAoXPX8B4NbD25JkXKtofts6RKq2p5zVi6Kc5Xb 6WYHEqmdsriC6IPSaNlzr4uhmPIbKZ+ieyK70cFDN1TDfH1rbJClenxuRYAuIuSq25fmGvc6F ajfmEfP4xAgycbtDQSDk2svRieDqWXEv5624uF1EdtTXpf+pxPNhRvKxwOb2c89lf115aHmxs TY5G7KEUz8fuMy8SomFjXHln6O0YTJpQAflwzIi7gE8t2ZryeWIpwBPezITLHkMBj0pChJva5 oqmmYutiGEr72iTDsBSws4xzIupblQGq2GPknJitORo0Igej13gcAQNcXSsOsQ50cMJ2dGO/r N5ItUjUmw+JEtZ/17U2AlPeZ7KS1esE5eZp+DbueYz07RQo3bSi68qYheqt4SZl0Y43/AzMt7 ep7hhVZDSEHVOgILImrft5EAIW/YoU7CQSMWz5dx+B4MUKeNNBd4taXqc12H2L4WKgUNFVL6y KnnDd2U8c7BzkDRT8/CWJpqPIIX2q2luipShiHZ36d1x/wJI/qG+9kHFa1PNpGDBw2XfYAz47 Iy0ZDvpfuZBku6TsA8f7SbJYUYHnuAmo4A+AKAZH5CuJg/RnGD1TFSM+46wT9QCNM8Z1c2V3c 6q7sE/kWafbFBcoZLCuGQCNZeB8lQ2nb33HCr8vAn7QONKIbpcvqdxUnYvER9JFhHSISJIwpm +MQrtGJyF4TcYaK9iQasCSsIPdqBXth3ksqiGdGaNbcrLarxxCP7ctnX0YnWtC1DgrJPig2 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 --- (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 Mon Aug 23 15:03: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: 1519764 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 4GtbCy6ZH7z9sWd for ; Tue, 24 Aug 2021 01:06:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3908382DF0; Mon, 23 Aug 2021 17:05:43 +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 BB5A180EE5; Mon, 23 Aug 2021 17:04: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 78ECF8032E for ; Mon, 23 Aug 2021 17:04: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.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M3z4W-1n8Mbk41Bq-00rYdI; Mon, 23 Aug 2021 17:04:15 +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 , Jagan Teki , Marek Vasut , Max Krummenacher , "NXP i.MX U-Boot Team" , Peng Fan , Simon Glass , Teresa Remmet Subject: [PATCH v2 4/9] verdin-imx8mm: switch to use binman to pack images Date: Mon, 23 Aug 2021 17:03:52 +0200 Message-Id: <20210823150357.247295-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:hobpO2cgbHqCIWLyPep+lndeni+KsnEcbWIG1kP7XRoC5nrK6fQ LI7GyH1xD4tVF6OpTFlWcUiMI21/rkP0EYmhq9iMjSSHfiAaEMXgBXmfovsWZG+cK6PV718 89TI5uO8HDpQj7XD5rGDaUjdICQA7xuQeGXqcfWhy0gNCX21cMu3B/DqnxGswPrKrRFB2g4 f7ty3oHG4y6YPPp7I7Mtw== X-UI-Out-Filterresults: notjunk:1;V03:K0:vvhrdv/jG7c=:kd6Vc/Gg0MoP5g55hp0Fv2 pWJeh2XZZ0BcsUe4CCoOayEdW/PAgF1rqkv9SSeAOsKooBQpvILkp+0PJIv2ov9axk3RSt7Ow ccYgLDyiVur+fZLspoTqjXNPJNCZflgy3bY6R2lvGZkY4+u1OBk0zWmpF7T1e+obkGLeXD/7n tXE1buU9S/JBrpnahC08O1eX7PRpZPRDIy8zIyoh60dDu277BAgeJSwa53OtjjlyKgOxCCBR2 Tr3ThZoUV11NrO000ZnTNZ5XD4bf/ezMz1imAjfpF+MBcmMfdk3DoxdyVrK3NP4Oy+0bz+IJv UShQLeZ6ma5r51zhwfa+jGwVPBD/gi8tDm16H9ooKaIVsqeN22NqrVtbvNN48y64nwQerQWdi smRf9zj4rQxu9PeTtIsA1yipb84b+eFPAJpdTK6MZGpMBNC0/QWk4IvNs/W4KreygvdCmgqL8 nH43+ww0KwO1l+7n+/OjrUHoN+j/Lf2qykK/ntJDqWCgoXWgdtv7aFev5g6exw1KvJdTPt8i4 v/GAMR1U9UWKGqXF5hiX5SK4FwXcjKGu/WTXl8xXKJzWsdKHS0/62dARaPe65ZGnCLI7q7Vdf Z6+eY4Hd0wFuxOkDJOhg8Tfl6CBJSRt6FrmJXZSRIFh3yLVwamb9qSbLaTh2mJIABVDu5sQad add9qRGt5ZCzTFJ1VMWOaZhjlvwviMbmTgT/FBW68a8HMYxzYdHPv4iHWubXzojfmH0H4hiwY jO0wjIxm/Q3B8e1Xkw/RhhNb//DNAeVYbF+5hRMRUfcuJC3Mutx3vyD0O6DDlTo0oq2RBRl5Q knZgV+/vIbLwSxFDqWnddNOXsk01hx+YAg4MEODDPv3t15olArL1OkrsYKTPdtT9c2MXAkL 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 --- 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..a3ad8f3ad37 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 { + align = <4>; + align-size = <4>; + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + + 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"; + fit,external-offset = ; + #address-cells = <1>; + + images { + uboot { + arch = "arm64"; + compression = "none"; + description = "U-Boot (64-bit)"; + load = ; + type = "standalone"; + + uboot_blob: blob-ext { + filename = "u-boot-nodtb.bin"; + }; + }; + + atf { + arch = "arm64"; + compression = "none"; + description = "ARM Trusted Firmware"; + entry = <0x920000>; + load = <0x920000>; + type = "firmware"; + + atf_blob: blob-ext { + filename = "bl31.bin"; + }; + }; + + fdt { + compression = "none"; + description = "NAME"; + type = "flat_dt"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + description = "NAME"; + fdt = "fdt"; + firmware = "uboot"; + loadables = "atf"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl: blob-ext@1 { + filename = "spl.bin"; + offset = <0x0>; + }; + + uboot: blob-ext@2 { + filename = "u-boot.itb"; + offset = <0x5fc00>; + }; + }; +}; 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..a303f98e170 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 Mon Aug 23 15:03: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: 1519763 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 4GtbCh1thtz9sWd for ; Tue, 24 Aug 2021 01:05:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F48882D7E; Mon, 23 Aug 2021 17:05:35 +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 D282282BE5; Mon, 23 Aug 2021 17:04:46 +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 C57B582DB0 for ; Mon, 23 Aug 2021 17:04:29 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LllQs-1mrFCL1LLU-00ZLGA; Mon, 23 Aug 2021 17:04:17 +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 , Marek Vasut , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v2 5/9] verdin-imx8mm: enable sleep_moci output Date: Mon, 23 Aug 2021 17:03:53 +0200 Message-Id: <20210823150357.247295-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:qt42t0LKOeYqmxHqu6hgsw1MwpbWyIK2rO9JZbXXl7JXsCAOnd4 hgzrUrnIHgZsVXjBqVHAYj1q9b2UVsg/XRYlJEVrkeF/OLGcXkUn0aUM2GBDoYr+wUAoQ+d aZxmBkphTCTY7RBcLek6dUNuDc7+qCNSLPDQcJ6FmQjtbh1PyEWS82BOLWqodEvcBy1sd7r E8bSFWCmuE/Y28O21TcQQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:NDFQX5uVLRY=:KaNCkdkUTpEsgZ8UzM3F5u Zk6d2DHPwCzfJ2CUPui5ut4Z0xg29aZzuMfWSPaF5+gTZAA1B8pVJ8yNhC3AS54fEjlyVgzo5 wBymQURFDQCvNG0YEEAMnBBykWIQTeAN2qKP3ztIYTmatN9QkwV8EfsAsvz/BsYK/0RikdSRJ 2klcM1t770aE3tH+Tt1RPowPppouPVKO5sgcMDtMkFpsgu4VXGjMta+PEp9ssSj/RhCryGke1 uDFSmlh0baWU4mRqdvLdio1Zz2bcCC5dCy2bR+H+dRrB1SEHLqkSUhDZmtp8uent5EDFquOhj aZu2ULppAAaqEebCj6jWY7OIJMTkKLiny6o08DV4P3pxZJSylz94rEupl2uf3UIeiQkHzYkPF YKtJKQG3wypozJH3XqKQPf5vljw/19aQGh5/UwyOBTcrzlyXJjTrLIdbGUyHtdiqoRcCfZ6VD hVQ/LB9mc9X6xOINC3DVW4uUgEGWK7Um2WJ1WODBQxT9/NV9TuhjbkItUkPchZ/4l06zzvxZo JgqopLKLPPyI0otyZ7JZOWk4fZM36Mga38Z5oXmhAIjRwTxju8sjvuXy14PCgns7iJSs3Esoj 2GnEWo2UkcNym3RqgTKg4n+Lq4hNQe6W+0rDDh/OaGikgqlh0Cxr3yY9Rcnm26MwDqi6/eWRL q6jQ0Whu4Q5RYeBxfKc50IhqclPY8wH6PKOPBygGNFUFe0ILNOpuCrBpcftdZ5N4r9YPuhufK wQZM1UE8AeUaCZqoqTI4bda6vLDfRExfb6C13g== 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 --- (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 Mon Aug 23 15:03: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: 1519758 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 4GtbCB4XCBz9sWd for ; Tue, 24 Aug 2021 01:05:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6F6938023C; Mon, 23 Aug 2021 17:05:23 +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 2578D82BD6; Mon, 23 Aug 2021 17:04:39 +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 5594B82C2C for ; Mon, 23 Aug 2021 17:04: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.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MYQ0l-1mV7ti1Xvd-00VCRL; Mon, 23 Aug 2021 17:04: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 v2 6/9] verdin-imx8mm: drop support for v1.0 hardware Date: Mon, 23 Aug 2021 17:03:54 +0200 Message-Id: <20210823150357.247295-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xJqASAH38XEDWUkS2M9MDfm4xr0Yd7HiNS8uvYMsJvpePY1gwke D0Gzs1J+qa9R1cV8tHdP01Mxb8Jdhcf/etntrPCZ/DDQZJQ/rC6bnp1577wXyZkqzGOFRI5 RAriFQpSwbCnEjYFnYtOGe5zB4Pj5hrjf5gSToOQwTvTS+6u0XfRl7rmPQ8AgJaQGQCT9V9 YNsyWcY+l5rxsOdD+8JQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:xxuIFI7cQQ0=:pwQqF0okqmezBFBG+DwSOk 96ifQRhT4wtpkn1xS7Ovv9OnImqfmPBe6IJWVbWpvFMthqOhWPK2eKcLby8pihz2FYifUmuV2 oXjg0rXvbsKiN/4/Z7nfRyGOwslPvX/e/5v2X0eDROXdVK+G6HNLukg1DTpyNv92MTXo2kFPg 9nnjw9bfVcQnuChKo+VQqHT31tRa3iVlHGdSyR9Dxx72BuNWKAobPFcIqlXzDIsVK76ZLDJuP UzoY4AZ1mtCeA4c/UpD8sz4mXpm2kRmlD1+FB88Mq49CG1aTRm6akGkc/wNH9bs2KJL6pkdvq XcJedes/dGokjKlPMzHL+cB8ehIWT5KCnQJz+i7HMAS9+wJehXjMI3weD9HDERjPPNM27i9XI oRT93DnogvgBSlKwnbYJ8smRy0hRiuVt3LSfRctdDqwSuhhAwMdrC5E5k3x2mnONay5VvKwK7 vCG1WICz3u6kDjuGGh9Gs8LkKG3ZctpN2/kMznJn+9rk34obE4V7ZmqKBtbpVN4gzy1OorgaZ JWzKCfO1qXe87Y2lwgeak2Hr9LVXgUDNFdcjoAy4ogLL23SEBmcpAI3/Z6xuiq5rWl2xeNj6b aw+TYheTOQh+U/gamMbaMWwDsKNArgYxeU+1EDEOwdA7EpWU0u5ZUJyvIfyqtehBxQo3NUm2h z9mttm2RdQz2lOvg06XJ/gWGP5SwOZNyGEgd4XsknkWJc3KXJqkntk+GlyvmIM+VNx/Mj5Xze oqn1rgSnUuS+V0k+S8BCxsL/LXdB0RiTIbqdYEiUNu/2OX/A02gGAKoZin/KoUwWr4QgUGWPu 41/R+xkqoWAaub66f/AgcOZpsle9Q96jtNxTwi6k/rXwYsu3460cZQj5JIRdwPVRey863HD 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 --- 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 1644f4b3081..2d8b37ce26d 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 Mon Aug 23 15:03: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: 1519765 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 4GtbDF13Lcz9sWd for ; Tue, 24 Aug 2021 01:06:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B078B82E7D; Mon, 23 Aug 2021 17:05:49 +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 201FB82BE5; Mon, 23 Aug 2021 17:04: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.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 CEE0E80FBE for ; Mon, 23 Aug 2021 17:04: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.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LcRm4-1mixzX2zRu-00joq8; Mon, 23 Aug 2021 17:04:22 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Stefano Babic , Heiko Thiery , Fabio Estevam , Frieder Schrempf , Oleksandr Suvorov , Marcel Ziswiler , Igor Opaniuk , Marek Vasut , Oleksandr Andrushchenko , Patrick Delaunay Subject: [PATCH v2 7/9] include/configs: apalis-imx8/verdin-imx8mm: rename kernel image variable Date: Mon, 23 Aug 2021 17:03:55 +0200 Message-Id: <20210823150357.247295-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:NcQsjb8yg1v1cFoHCvq37D2Vv/EDs8s3uBco732XPYj6nS4PUxD QJBpjVgk8VEi91qtRPn2f7fqeKbBFVEh62HqyxspSFEFRgq7s8dcRBAIDx6fcpaHiqwI9XZ kulyfgUFn8adN7m39Pz7JVtOJi6kBOvIDfgyRh96Aizh3plZ2hwlBHm2kA4Or1eYIO/XIZJ /8XUcTYG2MrPwgbvw8ZOg== X-UI-Out-Filterresults: notjunk:1;V03:K0:5X14KO035bQ=:kUKV99pj7veL+ku6hgO9x/ Pw2mn6Qn1KVB9CuMv9Gm/vPoLwCacOOE1MQW+WxM9qeXXqYo7ZD9TFwrqMMW1yXtUMw2QxQf6 fawbw7t9P2g0ZL8eIrxV3KtcZMbPjKChuQrGJ8hH8toobLboVnBywucen1tUq96DYjVRJglzq uCBvuA/LeVuB/stv9COqs5DLiaBnuWSTH5i5cBAWT/p1ufY24hG/KUFJ6AYl8KwKsDCm/4+VD F2EuUdkIhx6yNl9FZX2sZZFrSTLplDw3I89+Dos1I8GaJyjAR2w094kYCskIzLE4XUCgohejM FH1sBeb03nJAC2tbxfldYMkgeDcY3+Pxpept/VPb3RrUgEm/+VbeMbTAST7XWzPGwcRV6XJnD ckIJ1oQozlfG10Upjfb0NVLWlBCeyK/a6p5sSX42do2MbHvcDlvA+9nedSzqE2CtCCZ4Hz6QV JkaYvHVTfxZwLeFSjkp9xgunDdzBH8AizgEwJUZrtG2OlxNvV4HYmwnegtnclVUO3beTJFtv6 x+8Mhttk1GPkvKAoIpMEgZDkpbtCIWVx92O4E3dKnZFL3AFgHL7TCn4Op7S6+85cB0mtyN5oy dfmZZU/AyRuIO2KwEvfcoXFhH6v8mRGhBzqBQzOFUNa0UAVj9MsLHpI8VKIYyzF1F/di87Rk1 s98RXwxyOFimxGTca53dQQs4q2pilsWqi5f7M+f6byo1keJPTRf0oi/Z4baQxKVGOhMKRJ/pr x1cU01ER3jKcvhYtaxjhyT5zLmcRbRqkE747nQ== 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 --- Changes in v2: - New patch allows booting recent embedded Linux BSPs. include/configs/verdin-imx8mm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 7be5e5ddf11..ad13f804be9 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -60,13 +60,13 @@ "console=ttymxc0\0" \ "fdt_addr=0x43000000\0" \ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "image=Image\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} ${image}; " \ "tftp ${fdt_addr} verdin/${fdtfile}; " \ "booti ${loadaddr} - ${fdt_addr}\0" \ "setup=setenv setupargs console=${console},${baudrate} " \ From patchwork Mon Aug 23 15:03: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: 1519767 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 4GtbDj2tcsz9sWd for ; Tue, 24 Aug 2021 01:06:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B0CC82E0B; Mon, 23 Aug 2021 17:06:13 +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 1449A82D1C; Mon, 23 Aug 2021 17:05:01 +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 F088880EE5 for ; Mon, 23 Aug 2021 17:04:36 +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 (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lk6k0-1mst5m12hW-00c69M; Mon, 23 Aug 2021 17:04:24 +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 , Marek Vasut , Max Krummenacher , Oleksandr Andrushchenko , Patrick Delaunay , Simon Glass Subject: [PATCH v2 8/9] verdin-imx8mm: use preboot for fdtfile evaluation Date: Mon, 23 Aug 2021 17:03:56 +0200 Message-Id: <20210823150357.247295-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:A4XhnXoEDtyie1rDT7hX/hxcp/3pdqQct8UoNuChB4+KUeMqrYZ 9vpjvJBUa7FT+1lBqdMSCxyQUvKEWN8FRDbERshIAupcK95Ei5aKBUKeDBJKkKPXx4/H+qZ 94ycyyQQ1LfsyLWwdHz6/qHqsNBxL4mfFQMbpHttMzF2FMpGqL8AGC4B1/vGK6W+ksvDVcP U2KiqCydw0S4/tTw7wVfw== X-UI-Out-Filterresults: notjunk:1;V03:K0:yAJSs3T3uN0=:b8B6yROA7W8MxE4WSyrA2s fywl0hPR3U6wxQnMRYpssMJSDyJHOSz5SfxN2ozZWSSDQUDmF1/vs2fHpe7v+74EvwE/9lwYn cHUPaNfAsHtydN5JNa5FPJTGm6ATZI4yM0hUH546q2BBM1phCGIdfd7DZe4dKaq0gHcQg0m8o jnWLyeU6ZlyJ8SK8h7SKrCt0pa0rLXbyu+DN/oWsWWh076pyrO6LlK/ng+/hOirx6FtVMTny9 kMZmf8WLOGYfGd77kIAK047vJdIyXN4htmawhomHquf95e/Sc9q9P1HtQGVwt0D4W/SuRusBN oh6btK0BRJRmbWPPpf9LefumYsVFOL2rikVbNSvu6Fo7I/tdddCEEDqjwsRl4G8RMk10UnOFG J/vdCnpkXN2ah5zsxd5iAoHLiHSWPz9IDIqX9ZnHNEAh8In1cRdNYnY1CrKcxEyeFN8y6vEec EARObfxFq1DnOWf3zfMFzaG2zPomoOaLLjOeQ10Xd0PH8FEok2UicCa5U2orcRAuhqPjPuPkc 3reU9vzAs5sOqfzHdlB9EURrOkXX1xRZKuUZXG6et8HuIG2n+xrF7D0l6TjvQwsGcg6byqfpy 9IbL/uecAYz4GKh/kyMUYLZSgh527xWVAcdhKSR/SISiScGPUo0cOFxD9mCynAJk7ky2rI5Ur qj7O9ub9M1XL4CE1N94NtDze+wFj129P7h1CC4zhXKRQFA467e6RozXbzPHJhVEVGixaTdGpy GbRzUClfPgmjFERNsaPJ9EL01L8QHwjDgpfb5Q== 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 --- Changes in v2: - New patch addressing dynamic fdtfile definition. configs/verdin-imx8mm_defconfig | 3 ++- include/configs/verdin-imx8mm.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index ad13f804be9..42fb1f2114a 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -59,7 +59,7 @@ "bootcmd_mfg=fastboot 0\0" \ "console=ttymxc0\0" \ "fdt_addr=0x43000000\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_board=dev\0" \ "image=Image\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ From patchwork Mon Aug 23 15:03:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519766 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 4GtbDT1HJmz9sWq for ; Tue, 24 Aug 2021 01:06:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 465F282D1C; Mon, 23 Aug 2021 17:06:01 +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 8CCE28023C; Mon, 23 Aug 2021 17:04:54 +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 0A77E81BC0 for ; Mon, 23 Aug 2021 17:04: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.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lg28r-1moA7O4AB9-00pcfl; Mon, 23 Aug 2021 17:04:26 +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 v2 9/9] verdin-imx8mm: fix watchdog pinctrl issue Date: Mon, 23 Aug 2021 17:03:57 +0200 Message-Id: <20210823150357.247295-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210823150357.247295-1-marcel@ziswiler.com> References: <20210823150357.247295-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6JtR6X3hnVs+otfZlVXm04cxp6t2A3HowCYXvT5SNFnFeOhLrSs 2cvjvk4RhDvapRipyXgJi8XnUHTj5iKq4ncqYy2OxFK5FHqvMg9tDy2EbYn6bu4jbRHgb8/ tW8Cj/ZLLJD896ghbijZPU5WQ5b0dhemEmxpH+4eNHzYpJfCuI/zFodCDnBw3YxSJd7HB+U uKI9tDLxJUt26Ns6+bNKw== X-UI-Out-Filterresults: notjunk:1;V03:K0:QCHdbeIE9sI=:XX6kK3AXwgqu9i1UHXEj5P v9mDd5hjA1eoIc1EtHmwXHJ/G2bOFo98/TKcO3iIBdtJvMkevo7wfvl7bYuCV2V1axPJ4ag1v nNCFtEZEHLDo6w/u5AwB2XOwii+tLfP8jivaMtTKijXYxxDrHPt/XkGETd+IycC/Kkmq0VYgT qWRihHOuaWId4NB8Xg0O2XcWe9CTpUArdbD2XiTSW3W5rLIUHucg1Qr2vfMK1XSa3HqxkxdFA LyiNF7bTslKQaC6jYSUm2TQDi9I1TimpK2MprM4C9asSib7RT70hBZJG6HYcgvPoFRwL48sHM Kq9wh27YhPOS/NfdnxPYHLPSW53sNe/WV6PzwIaLrmiElzq1gLvRPhCAZvWuPKngfYbWgbYAd vFfzwzMAeAz5lwwZavhZLGxHCkxOrZHE+siaD9JAcdAzX0q2ZrX72Ny+TGedKxgl5T7rS0eHt Vl9wC3T1PfN16AfNs5TISTI4cO0uTwJ3K7aFmTi7A7XASDJjzBfD1tG/WmrOPbHUgo+dWUJLl 4VRRfj72u1k+SsDKp8n9OaG3b8BdNEHCbGagRzebi8bk1zFi9nRRNvIaCcDRN/yWTqO4sZP0R CnCsKhVJ95cUuXFTI7eHwqhIYa8P25kMUORABrbrc3TVLwnGSlfWsYQRMwkU2plyDHk7yxQyq PbD3TMZEIjWl+pAhsDMOA4Vkv3dIv55+4hwZfAXt74g8nzN4gkogxnUIZk3P2D2xSKopCMCu8 nExPQnwEaZS4urnV4UsBIQQIt+rruGvW4n2rTMVK6jVMuIWZs0IyouIGfzGzXebtu9MYd0VHo SFUoHWTZi0QYmfrdYlukCoNgpMwLMkMmpfR6fFtBakk83AoG+ongCoXLyD+eyrn5CKfCLZO 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 --- 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 a3ad8f3ad37..2cc35a6e6f6 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; };