From patchwork Fri Aug 20 20:52:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519190 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 4Grv472T3fz9sW8 for ; Sat, 21 Aug 2021 06:53:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6FCEA82E08; Fri, 20 Aug 2021 22:53:06 +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 2DA3082D50; Fri, 20 Aug 2021 22:52:57 +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 51C0080F4B for ; Fri, 20 Aug 2021 22:52:52 +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 (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MmTgj-1mi20n47JB-00iPve; Fri, 20 Aug 2021 22:52:41 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Peng Fan Subject: [PATCH v1 1/7] imx: mkimage_fit_atf: fix legacy image generation Date: Fri, 20 Aug 2021 22:52:24 +0200 Message-Id: <20210820205230.1369683-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Fr1zrP1UGlwwM5W4cCEg211I4OBu5zO37Sxy0Wv5T1dk6Jr1KIQ J1CIM7nshyr5Ju5GbOaWvvv0vcMfXOKuWPl/0oMXsCl4APdpPEDDMaAUhmWhk5BL0aScpge 7izhU5tZc/zD66tqStnVbtoM11BPP3uVuBl3Gzlq/82ce9Zygb26NilAjRWLt0RzmFbj/Xn +RrBHXzgkV/sa1D42smQg== X-UI-Out-Filterresults: notjunk:1;V03:K0:tS+k+Ay3dYw=:4NuDqpt/hQOq5RLtu9xe/N jOkPuYSELvOf7stqyR/IY8fp37b2z5CiORQFMdVmO7dE/FHoIsQLAZdqhuuNwe0p7kWJRlL75 vzgVlWIteF8bAvxUCpFg5dGoHvIOaE5QL1BDtP94+ZUpJtOQzXCnGh4QkY8ikXyjD8om1g/HL 8yj95EQcVQ0bXi3xp8bXTmfm/BzHOB4Gtmv0QbAYMm9+6xCKDVXiZQRmYeON3vmz94wGmZx5f QnL4lCcRvPNWxFIYIWZKWYY5DZed5nZYTSBkxXVRpb+W0Une+F3tx8uu8Q6CEhR/Oiz23poCa Kbe95tUpTroOWeZNxvrd+jUZMdaO7sgr9dYMSsZogLdSnsqQK9+OZidZGVNZuhHFykFXO22yV xp7oXWhdqrNQhQieTRZ8O0HX810r4oacDLaUz5+b8xbRzQCh3sANrqiGOys5nCMRhF8jZBWxd mGa+dpDvvoYJ7Js84yORlVGyZCi5rxtxp32+ogXdfhIDSmfgGZPsOylg8UtxoU+9nmOfMsrAa caVxDjrcbB87M8GEKaJMTbnpECo2GGnb1AQ4aNbfqoAEh1mAnebfqDEJfw6UrtErgrRJNycXx o4dZ+KpErjtPS7iAFI9yO2aidW/TKCRnxnRB5lZCiYKeXx3MAh7NE7e2jgz2GH0NGqS6Wr8aV 2PYeULr4yxdBg5ffqvLSFaDU/oYvNLK5DalWxYDKHKk+oj84+Rl59I160JTLrQ82Vq+2O8vU9 35LF2l45ILP2MQa7fQTYIXbUFWMMpROyGgJXG2zekTYqrWg+we5saNyHXUUkkmXT2XjxsbnVo Qqvk71qaqNzZw+/hqY+3WJBb21hkYmqzR0bRzk7hul6SfukB8kNiFLk/KqKAD7LCjXryCki 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 While most boards meanwhile migrated to using binman a few like the verdin-imx8mm are still using the legacy image generation. Unfortunately, the legacy image generation is currently broken which is especially bad for any kind of bisection attempts. Anyway, this fixes it even though we will also migrate to using binman shortly. Fixes: commit cb9faa6f98ae ("tools: Use a single target-independent config to enable OpenSSL") Signed-off-by: Marcel Ziswiler --- arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh index 2a17968794c..2d6c46633c7 100755 --- a/arch/arm/mach-imx/mkimage_fit_atf.sh +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh @@ -53,7 +53,7 @@ cat << __HEADER_EOF description = "Configuration to load ATF before U-Boot"; images { - uboot@1 { + uboot_1 { description = "U-Boot (64-bit)"; os = "u-boot"; data = /incbin/("$BL33"); @@ -68,7 +68,7 @@ cnt=1 for dtname in $* do cat << __FDT_IMAGE_EOF - fdt@$cnt { + fdt_$cnt { description = "$(basename $dtname .dtb)"; data = /incbin/("$dtname"); type = "flat_dt"; @@ -79,7 +79,7 @@ cnt=$((cnt+1)) done cat << __HEADER_EOF - atf@1 { + atf_1 { description = "ARM Trusted Firmware"; os = "arm-trusted-firmware"; data = /incbin/("$BL31"); @@ -93,7 +93,7 @@ __HEADER_EOF if [ -f $BL32 ]; then cat << __HEADER_EOF - tee@1 { + tee_1 { description = "TEE firmware"; data = /incbin/("$BL32"); type = "firmware"; @@ -108,7 +108,7 @@ fi cat << __CONF_HEADER_EOF }; configurations { - default = "config@1"; + default = "config_1"; __CONF_HEADER_EOF @@ -117,20 +117,20 @@ for dtname in $* do if [ -f $BL32 ]; then cat << __CONF_SECTION_EOF - config@$cnt { + config_$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1", "tee@1"; - fdt = "fdt@$cnt"; + firmware = "uboot_1"; + loadables = "atf_1", "tee_1"; + fdt = "fdt_$cnt"; }; __CONF_SECTION_EOF else cat << __CONF_SECTION1_EOF - config@$cnt { + config_$cnt { description = "$(basename $dtname .dtb)"; - firmware = "uboot@1"; - loadables = "atf@1"; - fdt = "fdt@$cnt"; + firmware = "uboot_1"; + loadables = "atf_1"; + fdt = "fdt_$cnt"; }; __CONF_SECTION1_EOF fi From patchwork Fri Aug 20 20:52:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519191 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 4Grv4F16gwz9sW8 for ; Sat, 21 Aug 2021 06:53:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3548281BDA; Fri, 20 Aug 2021 22:53:20 +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 2D4BF82DF6; Fri, 20 Aug 2021 22:53:02 +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,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 3724B82DD7 for ; Fri, 20 Aug 2021 22:52:56 +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 (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MHWaj-1mD4uI1XNZ-00DUxG; Fri, 20 Aug 2021 22:52:43 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Heiko Schocher , Ilko Iliev , Jagan Teki , "NXP i.MX U-Boot Team" , Peng Fan , Teresa Remmet Subject: [PATCH v1 2/7] imx8m: clean-up kconfig indentation Date: Fri, 20 Aug 2021 22:52:25 +0200 Message-Id: <20210820205230.1369683-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:TetQ1ja6K9/iuEam+2xrwXR17mP6THwgsry/IvmVYzkp3k4lEwA +ailBZaEwdtwQwJhgwQbdRr3Dib2PpJ89Jopf6XmrTS3NNWkuPIZ378JHXHlquXE2NT/gR5 LoS0s4c1OP847AkcZlUtZrFhy8o4BU5xqGeYMcNktaUxs1Gx/P+GSWeLXZtwE684s1rE09f EY3dlXbSqsq2iHW8ccB/w== X-UI-Out-Filterresults: notjunk:1;V03:K0:tOwmygagoC8=:xPP6mn4l6pKBfDjSDEuoTc qSvKN1IQHNByOX2Lo09b1M4AnqMt6ZcNNtlyHJtPjNcbvQcvMEtB05n7LfufnAeovjh582U1c R4PWO+pmWw5EZ707pX+tarv7c4ScDXOu8gaH4PqEVBAiGThbzK4mLkV6VQ/h9YL0WlURFg0u1 Da+ecvqKaAPqQx6qCvz/+2EmBO4TNWiqx9XBNyqbyHXVl0yhgwL//1JRvJuOZ7F/Rxld3rZjw MWx9upXBTJ5dbMd3VqB0TJn+XNTUT/xoHzfW6V0H5oSw9Wkld20J9MtBVTUL13ETsx7Lt7rS1 jhkxpA2jnX90jJQBhN86tjVAsyAyDBqQHKl4aNJgHnDUc+x+5c2yuNZXqB/1JrAz29pq6Pz3U qRNi/cB6DntZURTMSyFfKdKfKnAILCNOFlhsePYB7TFRcALt6f1JYMTabzc8CTbZxBFqfVFmF 5NJPM4ecG7yKEXeh4YZT4M1GnSokJrlIr/yprlcTQ6v3hlC1eJt+HC2l4B4XNQWRre5qLIQSX yCjQJvES4TE7hyrY+3oCSwjIsL0AhjIzLy1RZMUGpjNPTXMoMZDfnZD1iZUccKG3krmOFYG33 Xoqw2uVZnRkRzYv+AeW1iSan+wPmim8hXY60t7VXEdKQn0uduvvsukJhafBHvMzLo4GEw8+59 SjrahkUP7rPOczWofGjkxE6DINkMfoX46iwdK94iOqupIjzYhbGd0sWSXRmdUFzcphg/Q14QU LPRTGIb6qBBvylqQLBUVh8/54AT2VcmSnYsSkEOJgpZhwL9B1PR+/9NjzUCPBmtLoT2U/nxVP Sw51U/AYexz0VV5GYRVdcxR8pot2lLl+emjNcMVqEZgqsx3TJPFOI9Fk9Z76DR790cDtd+i 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 --- 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 Fri Aug 20 20:52:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519192 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 4Grv4S27wvz9sW8 for ; Sat, 21 Aug 2021 06:53:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4C2482DF6; Fri, 20 Aug 2021 22:53: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 E104B82DE4; Fri, 20 Aug 2021 22:53:02 +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 E4DD682DB2 for ; Fri, 20 Aug 2021 22:52:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=marcel@ziswiler.com Received: from toolbox.cardiotech.int ([81.221.236.183]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MZTNi-1mW75v26cw-00WX6r; Fri, 20 Aug 2021 22:52:45 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , Igor Opaniuk , Max Krummenacher , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v1 3/7] verdin-imx8mm: fix ethernet Date: Fri, 20 Aug 2021 22:52:26 +0200 Message-Id: <20210820205230.1369683-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:AK7acBrcXN1IsbD09X1Y9bh3sAgIURIoS/pZ/Y2MdqbXs3nFIee MoXR2mO8JNL/RzG+5khoYIcNBprGm7nkGEmMOdKFAVx8gGtVsbvyLA8jA6XJr/OyIfDoknG TW0O8idPy0mrtDOUK1PAqQoSnWISYYQ6eDQSWUVKNtHNsVD/Uz7kyilXLecupu0J+3ltpkQ UoX6SxpKCK2UXyj9nsfTA== X-UI-Out-Filterresults: notjunk:1;V03:K0:zSMcsBW7KbA=:noBJeEf4PV2pBJfG6focly r4cOBBPWlvGl7XkilN1jXDKSK9CLWbIeCLJ138NkZ0x7Qu4MmDrgKMpRe5v16RYVsT6mtY04I WDu93Mbz6X5QUGoA6h+0HOvR+ineN6hjoMKdoUtu9hwdboi584WH+sjttpOPw4Uyi8TlmJ0hr Y64HdeBZ4hmLftOyZy5QfzmeaaAsDiKdqosBfnTKD5U0foyaDdgf7ojBA6cxb/QydrylMsxcT q57ES+9H26FKcKrjiLRWTLsz1tbrwmEanqqvYbBMPUvnOqfnXNR9DdY8YoJ4Xh+Ie9npJDG3d YYq1uHO7t7ttiXPmo8TPP2VvnrQsFL8/4rXNOHwSaq421HGmEM3dsvfKAkgTFZ5p5OSEPZFn5 EOU+yYZmG3cRzs6k2jLuVREjwYXAN30UQTWpF0CmzlN3NWODZJGncXcUNT+qH148RfGRN0wTg +vSJkboKOnuFNBYYP54kz/eSnldcDTlPRIdQ7aAgCzPp+R2KPvJ4XYllXFublngMZAIeaEjr/ ybx9BlHb6+svE+TfOz44+S43cMTqTvz6XPoaWSSWG4J7D1bKvB2TCzilUSk3c7KJ3y1/kppoF spqJuGd4YZmDxVKgjS/YGbNM0smO/UFphmYnPUF0amsOcIYRk9nRMzEThoXvuTb6AXrr57IzG LGC3MEEVDHX/9s6qZ8RQeMHbSWFYq8ImpseCaZWJ1mg9+zoeEOn8pQt2/0UaMK0MzSH9JOl4q C9XLdEcr8tvGIxOsolB0mbUmdm6LNrFSyJHy8iXrbNbbesryWvcD5deAF0kXX8gs7MikjSZxm SuiBVwig3MMBQl2izIYmzfwYxSktLy1yKEQV05nH5fGHohczqMc22OeImj82lZnakiN06Qu 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 --- 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 Fri Aug 20 20:52:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519193 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 4Grv4g0Fl4z9sW8 for ; Sat, 21 Aug 2021 06:53:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C11BD82E1E; Fri, 20 Aug 2021 22:53:29 +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 EB58D82DE8; Fri, 20 Aug 2021 22:53:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE autolearn=unavailable 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 2C4FF80F4B for ; Fri, 20 Aug 2021 22:52:59 +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 (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MMX5X-1malvE294x-00JcwG; Fri, 20 Aug 2021 22:52:47 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Marcel Ziswiler , "NXP i.MX U-Boot Team" , Simon Glass , Tom Rini Subject: [PATCH v1 4/7] ARM: dts: imx8mm-verdin: prepare for dek blob encapsulation Date: Fri, 20 Aug 2021 22:52:27 +0200 Message-Id: <20210820205230.1369683-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:C1llwlj2nAz6unOQ6nCQxeQ/ySoeYgR4uh8DWfZ9H9r9nLHMQcF qB6PsubReAfjRyxk386tFXiDh3+w5dOVfHUZw1Uk163RktIXJ+mk3CAgQtlp1Kd9gWY4ZcA rEmS4WyavqPyqqtgJguTzKa8vw0WhgE2jvnCuqSj7uizihZQQifEB02DWhROSbN+0mibMV4 rM/1VZMiDSjQwbq4MDOlQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:y4qvjSYRBSM=:TnTvErlSgmL5uzpP2m1MMC BiWf4s2Ew0my1AUXTWrpG5uSkA/CbyywM1z8x2MRcuOy3I4ZvT6aGXlzWM8FbHObFfD2u5yrN iY0bLDHCHAYYVHBcAbOQDNLEoswkTH3gUPGeifhTrFHKnI/z5XhmIoeEatW2/vH03vpVYmcKy 8qLOOlybFujFexcwlNJhBach/cZqTpewXHv6n1JiY4K1iM6qfNkzqBKoF+q6FQd+xIiAOzy24 X4X/ao+3G2EZvVdiNopiop7tXBfmfpAyloobGIez619NBDddMpNOYm8DmV+L12EWk0oClFl2W bGfgCGjPvYqYLotT1Kei7gxWhVEiKW4lq2Zk+jxvxdGwomciZrBilfyNOQAEctx2V0ecioYQJ 98CSjRbZbH4wRrC4IWoZWPlLMqeAtS9/YE7SZSwH5IbQeClgicV5hcSkI1EubfD79S4O9Z30b q+xCw026ZBEomps5EpXpHIHR0ZT0PiunRY4S482XqzqcT7JW2LVC3qhGkb935WUXsLO4MfUY6 UsH2XIdxLM2drU9Qx1wpHhZC17D9vAVOf8o2wcUgWBtXb1Q7SBkEaeqk7ilKivPfdi2bKuBZl kCFjORcV3Dc9QbrEcPK72Mt+M2Jeo7WnVqrrbG6vcIuxtUlccuorwsAieDiAwAYouUOT0xV+1 pCmaSB0NvaNVtsbvlBSD69zHxCfpYWYESX39h/Kp2pgZ8CtvgsXrO9/+u9qKNYemsKOsQv+E+ Cny8DXK2y2BhDnryISJvc95JGbTEFbeNbtzcRyyrXFfjFVZCmRNhNO9cdlJqWCNM97YmW9AhT swFkwO4ecGvAnV60AXL7pdkl3FCS93xZkY5Gfc97famlI1q13pYQmjphlgTREEp4wkbXEI3 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 --- 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 Fri Aug 20 20:52:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519195 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 4Grv546lJKz9sWS for ; Sat, 21 Aug 2021 06:54:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D24282EDA; Fri, 20 Aug 2021 22:53:38 +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 73DF181BDA; Fri, 20 Aug 2021 22:53:11 +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,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 F3C9182E03 for ; Fri, 20 Aug 2021 22:53:00 +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 (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1M3lDb-1mI0aP2Kqh-000rdI; Fri, 20 Aug 2021 22:52:50 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , 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 v1 5/7] verdin-imx8mm: switch to use binman to pack images Date: Fri, 20 Aug 2021 22:52:28 +0200 Message-Id: <20210820205230.1369683-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:dGH+7D05AetFmrzTAMwscoVRNyPnwE8r9VZwKua4ehonRf76oKp tGXH8o4qLzzVZxY6mlz68ePJ6HGjMMAtQxCFNlXNGXBooL+2xxAJz1VQMqx+9SHYPSucDdO xcMiuPqpdCzOZJgVz6MHZi3N4c+bg//wfkiTWnvlcyqUFiLA73iW0omZ6FeNkOBgMGiqwYD fXhJ1G1DWYwRLiQk7vMTg== X-UI-Out-Filterresults: notjunk:1;V03:K0:2iiUbCCHwDk=:WTbMZnctHCi7HGkzxTEIU1 cqkDcut4EVc7RDLgss8t5/VPP5sHj6R1kaGtfieglEC24XUr5hRxjY8NluyWUGj8OBrRLAFDI d9jVCdh3uima38xqplcc3yLR2rx7c2trDDo5tvZ/qdeRo2R0SL70PG69Iu8VwuTa38/fyVwNp X1vOzvu1nQowGYv5bd3CE5QsWwQmQtgUoHajNPqMK1h4C5H23gXUdPasj2/83p2bq0Tt4hEkO 7jb6B16NWSDPCKnxzqcVsmTsL0hjH++rj9FtxqNWU/t4/jXpGLHtiRCp6kd1Bi6qvWAw6HJEC afgUdvj0ja2lgP504zNuuF1TmZCaBnAKYDlao4DnvVZNk8rQrnX8F1OixlYPRYr+ZBK4OfAaP E6jDC4eyxSxnjvXn6xxSGLW0rdSDKr8i1W1WzFmVSn6dVpOFg5uc73AetCpzwfk5+yvu4RGvG 9eJmlw/0X1gN6iekDDnfePb7vYi8mkW9JRt35NWiW4R4xWSwCGYvD+CjojnIrciBSShOqsbnA IdmNml0D9DCtDeaOqb25JXN5Lnd59e1yJpHvu0vb+iMVC/gp6u24KAWq4ldXHr6R7xMzRgw8x OrpJXbKsb7s8iYPHmf605WeOZwUuBFqjHt/+eIqIB8vUiOvgGxRyTV3Qahk4AM4O5YS11Du5L OO6EUs/HHPEace9KV15sW8aR9wcai9bLybzlcV2/HzT168hGEkTb1wr4oh8wV1hgwVEal+5JP PqPOAHwSSz1W3QTL2Xi8XCVEqn+WMv+T5ei2fSHcWcDD2Y+SU4v8ICKKxhhnpkieCuafVsZ4h grqYmAG0z5Iw2fNtRM4krXuE62QGrfZ9H0v0s6nHLYZmntw/g0BiW/ucP/7xmUgZmmQKO6c 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 --- arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 122 ++++++++++++++++++++++- 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 | 54 +++++----- 5 files changed, 155 insertions(+), 35 deletions(-) diff --git a/arch/arm/dts/imx8mm-verdin-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-u-boot.dtsi index a97626fa0c1..ba4c8d0436c 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,119 @@ &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 { + 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..9bd60e39fb5 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 mkimage.spl.mkimage 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..538ac30dc12 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 ------------- @@ -77,22 +77,28 @@ Boot sequence is: 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-00021-gfb148bbd529 (Aug 20 2021 - 22:11:20 +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-00021-gfb148bbd529 (Aug 20 2021 - 22:11:20 +0200) + +imx_wdt watchdog@30280000: pinctrl_select_state_full: uclass_get_device_by_phandle_id: err=-19 +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 Dahlia V1.1A, Serial# 10763237 +Net: eth0: ethernet@30be0000 +Hit any key to stop autoboot: 0 +Verdin iMX8MM # From patchwork Fri Aug 20 20:52:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519194 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 4Grv4s65JKz9sW8 for ; Sat, 21 Aug 2021 06:54:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B3A382E7D; Fri, 20 Aug 2021 22:53:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=ziswiler.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 37E1080F4B; Fri, 20 Aug 2021 22:53: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.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 4D99D82DFE for ; Fri, 20 Aug 2021 22:53:03 +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 (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MN53J-1maDxZ3VWX-00J4yU; Fri, 20 Aug 2021 22:52:53 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Max Krummenacher , Marcel Ziswiler , Igor Opaniuk , Marek Vasut , "NXP i.MX U-Boot Team" , Simon Glass Subject: [PATCH v1 6/7] verdin-imx8mm: enable sleep_moci output Date: Fri, 20 Aug 2021 22:52:29 +0200 Message-Id: <20210820205230.1369683-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:zidp0luFI2kU0woal6UJ4TiYX7GEfZfXbwgBgIKLHES0Q608Yy9 r7svoHg8dWd5YHrWcxXgFUqF4Ci5pPpeCofoohZ6/j9t5AG/Gz7KkZXuyXXl0OUwr9v0I9k hZo3Cy4GDPvRMOMjHbj98ekcp1UNLO8epRG5m69hY2e+0PK9OlzylR5De5ekmm0pAW/HA3e so2GpLIbQi88fFD1SH82g== X-UI-Out-Filterresults: notjunk:1;V03:K0:J2CUwQNZ9t4=:SeLmZHCOGRZLjiQuog+2A2 Nu8uDu5ml+kNYdoLxb3ojsgsfF18o5g5MZBHSZKT0etgnTKSA4gcOr2WEVcJ/hhTG71vIjPGs 6LcVGADSofTeg8BKEZich7RZhfWoQb2exrRMedRnE3/vCdt9Ahe9o0bKWa3SgOQID3JFiwSfX uKHbNLtiUVw3Yl5gubALTBO8QP8UsPiXOef4qgiJh6lHwwwHrqygkOJuiszDehqVSQ6D2BJks /1xxEQM+Pwu676t0sBfWSX4HDDn8AnHXa1FxTrTPSVVihsWw1/kCriYyquKa/D82gkfRIUDh4 UzGZyiytumh7V/6zWS4+dcEYMooUof6FrmsjUtd4Sf/pSU91AyyYILh5Gp4Brw8acFL1sGxkm SKqfL7P6LxiaPiMkUYTXbwBgD7QWMzevAeXeuIWzLBQS62mVWGbRRsMkVCapXm7S+jgDoqWCP 3qN1Hf7T6w51ooDUR+9PqoW4kzCEOjKHZBd4JPFdfB+ib+3PoDr1JFuPVTlysJomtQoAHh/Kj cgGlvinIozwkLe1eMfojmQ0Cnesu4Mqc8cahLcFvhSqmhdLOGz5xJG/HI75mbVS3JwjgrXcs/ 3CqSxhWSyTljM1sJCgJjIPKbHlvYwt8JPzML6EYq9W4Pw/IwMVrNW4P32ks92nkwXekB6+4TC wPQpC3QPVecU3fxa/peH+H6D4BB/tysmqrdNruAC4NdgdJfx16Ay2xTXqE/MfWPB/onbRe/M5 IS3lappoDXQ4lg/tBF+3JLmltG3gfgVP3hQdFrkXl3OSvhg4mwhcdER+m7dlLn7C0gS5omifz QvxtLSYvDEwQeaPau3PeNIvwvE0luxgP0hRs0kI/E+OT0HlkouvVzhqFOSXc72lSOr7TtTL 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 --- 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 Fri Aug 20 20:52:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1519196 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 4Grv5J5GL8z9sW8 for ; Sat, 21 Aug 2021 06:54:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF5B482E3F; Fri, 20 Aug 2021 22:53: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 2F7B280F4B; Fri, 20 Aug 2021 22:53:17 +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,SPF_HELO_PASS, SPF_NONE autolearn=unavailable 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 3B16482DDB for ; Fri, 20 Aug 2021 22:53:03 +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 (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N5FYf-1n0nKt3fUL-011BEc; Fri, 20 Aug 2021 22:52:55 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Cc: Heiko Thiery , Stefano Babic , Fabio Estevam , Frieder Schrempf , Max Krummenacher , Marcel Ziswiler , Igor Opaniuk , Simon Glass Subject: [PATCH v1 7/7] verdin-imx8mm: drop support for v1.0 hardware Date: Fri, 20 Aug 2021 22:52:30 +0200 Message-Id: <20210820205230.1369683-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210820205230.1369683-1-marcel@ziswiler.com> References: <20210820205230.1369683-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:bfBiRnmdkt9OnU6jx0/19FeMpgVi7vQKeGEpmbC6QYACbJ0Pyix uOKj4piwNgcbwDq5BZZne/0o1FV7vxf7xFHtPBspPOFbmB2GY7y8U+QF23yq6Hkul4WaDOA hEd+LDymwrFQRFj9qlcThG+Z0VW5Lxhu0IG9R0XP8OGzZfq0V6eNg4PabezFGKsingfcvLf sRO8L7cKDFA9epW6wPNlA== X-UI-Out-Filterresults: notjunk:1;V03:K0:hzQg85DBouk=:ld8ANGq+JVM14aehP8KZqC Gm/QEtc3iE7S3YdjEJLhH2Pa+erkIJo2PxYg2RL4Mq60yv9Ue3k29M2SG1BnCH1VMznqweuC9 MFLzOsfiY5SDI0hCpKlZtBQi6gHla9B1qUHj+z9Apu3MVIJlQOSjtRHJp4nUm/naUiXyw/RsS RuTpDjPwgySp1kPhFsHYjvT0bjh8xnJDHwd18bsadOJEQc7eIL9UFJM8rgMz2LtLRJhXA8nvd G5vbEKw3suRxdkZlmOPLtFoVhLiJ6e5ir6BaePuhzz8jeyW2nALZrh3B4GPD2GwYD9i9O3F8T ImnxprXjN3EK0w9wlY1RTeyZoZzqDtIR75VwsivFuWuOheWaCKWn1ipKkU0vb/niVzQZM4Hzf t/5maLAnhBZ2DTpnnsfCGIJc/pwoE6+9zwPUWUouqRj9TgDpqsuzUsQUizrfcgW18VvVMuLIA RpKEA1S6fgF2CPXIUIXMBoPSiDAcy5OZCdvK+g6A0JHKtpiySe5MzuFpeZ6K5BUgiLxT8pZP7 n4w6SNbe7d7IE6ROk8GAJzj0q4Bjv/fT7XfTA08g6JEYJviYBota4d3841xmuvVX4VZFta9y8 m/jvmZq60O6OXQNAzjYxtBjwCVFhkKaPyd1vQBpRHYwe3RGx+7aQ8TIOWEinPoElTk3VuMaZH SPSAcpFX2GrkmazL6F4Zzn5PYAdz1l15KU2PLopBSenQ2SWogdcW2VZTR1o5rQyrePcUyTxdd WHW8DibfWu8xPlIg6y0lYgIyXgG87DSu2SammbMJSL6vPZzD3Qssc9E9Zncj68v9I7lAgZ02g qNCzgP9I7VLbrtrXfvQpOXfjLeDssBpIiCGQIdlAxb4fAfMfOIvHVl0/DzTyVSnI+kNbkyY 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 --- 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; }