Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BDACC07E95 for ; Wed, 7 Jul 2021 12:58:34 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B1DA61CBB for ; Wed, 7 Jul 2021 12:58:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B1DA61CBB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 064BB82E04; Wed, 7 Jul 2021 14:58:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=phytec.de header.i=@phytec.de header.b="NZo9fGGe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A88B82BED; Wed, 7 Jul 2021 14:58:12 +0200 (CEST) Received: from mickerik.phytec.de (mickerik.phytec.de [195.145.39.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5033F82DFA for ; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=phytec.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=t.remmet@phytec.de DKIM-Signature: v=1; a=rsa-sha256; d=phytec.de; s=a4; c=relaxed/simple; q=dns/txt; i=@phytec.de; t=1625662685; x=1628254685; h=From:Sender:Reply-To:Subject:Date:Message-Id:To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=HMfrN/dyhown0kbJKdT94oYeNRTQ/zE/5D0mW70BIQY=; b=NZo9fGGeu7ixqOLgUqUgqPoNu1STlmChxMWnsMGiv06XToz1yWf2sgLYtOxJv/Eh 2LUu4qvSTWqawSZbi+659rkgxTlmd6VIn89Wt+TbThB9hc78FoWK0KD0yuEcWxu7 eO30O92TYB92Xq/1c1buoSeHs0hpcJX7FjKJG1D7cCE=; X-AuditID: c39127d2-1d8f870000001daf-f2-60e5a4dd78a8 Received: from idefix.phytec.de (Unknown_Domain [172.16.0.10]) by mickerik.phytec.de (PHYTEC Mail Gateway) with SMTP id 0B.71.07599.DD4A5E06; Wed, 7 Jul 2021 14:58:05 +0200 (CEST) Received: from augenblix3.phytec.de ([172.16.0.233]) by idefix.phytec.de (IBM Domino Release 9.0.1FP7) with ESMTP id 2021070714580488-1108501 ; Wed, 7 Jul 2021 14:58:04 +0200 From: Teresa Remmet To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , "NXP i . MX U-Boot Team" , Peng Fan , Jagan Teki , Heiko Schocher Subject: [PATCH v3 2/9] arm: dts: imx8mp: Add common u-boot dtsi Date: Wed, 7 Jul 2021 12:57:57 +0000 Message-Id: <20210707125804.3010652-3-t.remmet@phytec.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707125804.3010652-1-t.remmet@phytec.de> References: <20210707125804.3010652-1-t.remmet@phytec.de> MIME-Version: 1.0 X-MIMETrack: Itemize by SMTP Server on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:05, Serialize by Router on Idefix/Phytec(Release 9.0.1FP7|August 17, 2016) at 07.07.2021 14:58:05 X-TNEFEvaluated: 1 Content-Transfer-Encoding: quoted-printable X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrALMWRmVeSWpSXmKPExsWyRoCBS/fukqcJBneX8lo8vOpvsePOfWaL L5smsFn8WPWF1aL9lI/F272d7BZTHq9nd2D3WPvxPqvHvFknWDx2zrrL7nH2zg5Gj43vdjAF sEZx2aSk5mSWpRbp2yVwZexfeoC14IhNxbf9fYwNjDd1uxg5OSQETCRWT73F1MXIxSEksI1R YuL0pVDOBUaJlk2rWUCq2AQ0JJ6uOM0EYosISEj86r/KCFLELHCdUWLy+hNgCWEBB4mZhyey gdgsAioSy5a2gsV5BSwletv6mCHWyUvMvPSdHcTmFLCS2HviHpgtBFRzc/oHVoh6QYmTM5+w gCyQELjCKPHm8lGoZiGJ04vPgtnMAtoSyxa+Zp7AKDALSc8sJKkFjEyrGIVyM5OzU4sys/UK MipLUpP1UlI3MQJD+fBE9Us7GPvmeBxiZOJgPMQowcGsJMLL6PA0QYg3JbGyKrUoP76oNCe1 +BCjNAeLkjjvBt6SMCGB9MSS1OzU1ILUIpgsEwenVANjgGLF/ENliruuz3yizcTzkPH0nZ7V bitzO9nUribf0TvBlfXwQPRdJa3EMmnOyh3sG5uNz5tx3+thuLJq+/UdTW/WPNeedOJWFf+x ua1zhb7/j5r28f11vpDAj3m/zzCeTrxwe0eQ1SeJ+gsxWacdSw90p9cuu+4lU/AsRvsVc573 w96kDbPeKbEUZyQaajEXFScCAKFQgUxTAgAA 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 Factor out the common node settings for dm-spl and dm-pre-reloc and move them to imx8mp-u-boot.dtsi Signed-off-by: Teresa Remmet Reviewed-by: Fabio Estevam Reviewed-by: Heiko Schocher --- Changes in v3: - Moved binman nodes to common imx8mp-u-boot.dtsi Changes in v2: - none arch/arm/dts/imx8mp-evk-u-boot.dtsi | 143 +---------------- .../imx8mp-phyboard-pollux-rdk-u-boot.dtsi | 39 +---- arch/arm/dts/imx8mp-u-boot.dtsi | 149 ++++++++++++++++++ 3 files changed, 153 insertions(+), 178 deletions(-) create mode 100644 arch/arm/dts/imx8mp-u-boot.dtsi diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-= u-boot.dtsi index 4162f41cffb6..2abcf1f03d4f 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -3,11 +3,9 @@ * Copyright 2019 NXP */ =20 -/ { - binman: binman { - multiple-images; - }; +#include "imx8mp-u-boot.dtsi" =20 +/ { wdt-reboot { compatible =3D "wdt-reboot"; wdt =3D <&wdog1>; @@ -21,43 +19,6 @@ }; }; =20 -&{/soc@0} { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; - -&clk { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc=5F32k { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc=5F24m { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips2 { - u-boot,dm-spl; -}; - -&aips3 { - u-boot,dm-spl; -}; - -&iomuxc { - u-boot,dm-spl; -}; - ®=5Fusdhc2=5Fvmmc { u-boot,off-on-delay-us =3D <20000>; }; @@ -156,104 +117,4 @@ phy-reset-post-delay =3D <100>; }; =20 -&binman { - u-boot-spl-ddr { - filename =3D "u-boot-spl-ddr.bin"; - pad-byte =3D <0xff>; - align-size =3D <4>; - align =3D <4>; =20 - u-boot-spl { - align-end =3D <4>; - }; - - blob=5F1: blob-ext@1 { - filename =3D "lpddr4=5Fpmu=5Ftrain=5F1d=5Fimem=5F202006.bin"; - size =3D <0x8000>; - }; - - blob=5F2: blob-ext@2 { - filename =3D "lpddr4=5Fpmu=5Ftrain=5F1d=5Fdmem=5F202006.bin"; - size =3D <0x4000>; - }; - - blob=5F3: blob-ext@3 { - filename =3D "lpddr4=5Fpmu=5Ftrain=5F2d=5Fimem=5F202006.bin"; - size =3D <0x8000>; - }; - - blob=5F4: blob-ext@4 { - filename =3D "lpddr4=5Fpmu=5Ftrain=5F2d=5Fdmem=5F202006.bin"; - size =3D <0x4000>; - }; - }; - - - flash { - mkimage { - args =3D "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x920000"; - - blob { - filename =3D "u-boot-spl-ddr.bin"; - }; - }; - }; - - itb { - filename =3D "u-boot.itb"; - - fit { - description =3D "Configuration to load ATF before U-Boot"; - #address-cells =3D <1>; - fit,external-offset =3D ; - - images { - uboot { - description =3D "U-Boot (64-bit)"; - type =3D "standalone"; - arch =3D "arm64"; - compression =3D "none"; - load =3D ; - - uboot=5Fblob: blob-ext { - filename =3D "u-boot-nodtb.bin"; - }; - }; - - atf { - description =3D "ARM Trusted Firmware"; - type =3D "firmware"; - arch =3D "arm64"; - compression =3D "none"; - load =3D <0x970000>; - entry =3D <0x970000>; - - atf=5Fblob: blob-ext { - filename =3D "bl31.bin"; - }; - }; - - fdt { - description =3D "NAME"; - type =3D "flat=5Fdt"; - compression =3D "none"; - - uboot=5Ffdt=5Fblob: blob-ext { - filename =3D "u-boot.dtb"; - }; - }; - }; - - configurations { - default =3D "conf"; - - conf { - description =3D "NAME"; - firmware =3D "uboot"; - loadables =3D "atf"; - fdt =3D "fdt"; - }; - }; - }; - }; -}; diff --git a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi b/arch/arm= /dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi index 20e7f63ff91f..6c1528934a98 100644 --- a/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi @@ -4,6 +4,8 @@ * Author: Teresa Remmet */ =20 +#include "imx8mp-u-boot.dtsi" + / { wdt-reboot { compatible =3D "wdt-reboot"; @@ -12,43 +14,6 @@ }; }; =20 -&{/soc@0} { - u-boot,dm-pre-reloc; - u-boot,dm-spl; -}; - -&clk { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc=5F32k { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&osc=5F24m { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips1 { - u-boot,dm-spl; - u-boot,dm-pre-reloc; -}; - -&aips2 { - u-boot,dm-spl; -}; - -&aips3 { - u-boot,dm-spl; -}; - -&iomuxc { - u-boot,dm-spl; -}; - ®=5Fusdhc2=5Fvmmc { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.d= tsi new file mode 100644 index 000000000000..d61346da3032 --- /dev/null +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2021 PHYTEC Messtechnik GmbH + * Author: Teresa Remmet + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&{/soc@0} { + u-boot,dm-pre-reloc; + u-boot,dm-spl; +}; + +&clk { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&osc=5F32k { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&osc=5F24m { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&aips1 { + u-boot,dm-spl; + u-boot,dm-pre-reloc; +}; + +&aips2 { + u-boot,dm-spl; +}; + +&aips3 { + u-boot,dm-spl; +}; + +&iomuxc { + u-boot,dm-spl; +}; + +&binman { + u-boot-spl-ddr { + filename =3D "u-boot-spl-ddr.bin"; + pad-byte =3D <0xff>; + align-size =3D <4>; + align =3D <4>; + + u-boot-spl { + align-end =3D <4>; + }; + + blob=5F1: blob-ext@1 { + filename =3D "lpddr4=5Fpmu=5Ftrain=5F1d=5Fimem=5F202006.bin"; + size =3D <0x8000>; + }; + + blob=5F2: blob-ext@2 { + filename =3D "lpddr4=5Fpmu=5Ftrain=5F1d=5Fdmem=5F202006.bin"; + size =3D <0x4000>; + }; + + blob=5F3: blob-ext@3 { + filename =3D "lpddr4=5Fpmu=5Ftrain=5F2d=5Fimem=5F202006.bin"; + size =3D <0x8000>; + }; + + blob=5F4: blob-ext@4 { + filename =3D "lpddr4=5Fpmu=5Ftrain=5F2d=5Fdmem=5F202006.bin"; + size =3D <0x4000>; + }; + }; + + flash { + mkimage { + args =3D "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x920000"; + + blob { + filename =3D "u-boot-spl-ddr.bin"; + }; + }; + }; + + itb { + filename =3D "u-boot.itb"; + + fit { + description =3D "Configuration to load ATF before U-Boot"; + #address-cells =3D <1>; + fit,external-offset =3D ; + + images { + uboot { + description =3D "U-Boot (64-bit)"; + type =3D "standalone"; + arch =3D "arm64"; + compression =3D "none"; + load =3D ; + + uboot=5Fblob: blob-ext { + filename =3D "u-boot-nodtb.bin"; + }; + }; + + atf { + description =3D "ARM Trusted Firmware"; + type =3D "firmware"; + arch =3D "arm64"; + compression =3D "none"; + load =3D <0x970000>; + entry =3D <0x970000>; + + atf=5Fblob: blob-ext { + filename =3D "bl31.bin"; + }; + }; + + fdt { + description =3D "NAME"; + type =3D "flat=5Fdt"; + compression =3D "none"; + + uboot=5Ffdt=5Fblob: blob-ext { + filename =3D "u-boot.dtb"; + }; + }; + }; + + configurations { + default =3D "conf"; + + conf { + description =3D "NAME"; + firmware =3D "uboot"; + loadables =3D "atf"; + fdt =3D "fdt"; + }; + }; + }; + }; +}; --=20 2.25.1