Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E4E04C38A2D for ; Mon, 24 Oct 2022 14:02:16 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 158A484ECE; Mon, 24 Oct 2022 16:02:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1666620125; bh=v//TIQQ3mSoaFI26zXB0yNpF57NOPYq13YyTiiyWQ0A=; h=From:To:Subject:In-reply-to:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From; b=TTO31X+DHHCmfaGkCuj0Z8p3vlmHgf8DDyr5iRrei/Q8fcJpYKvJSLGWxdNHQrBoh ffDycu06rscAXioWArfyqM/0Fe0CI/0nfBJMxN8U8z1Xq8EKuS9uy+d+Bd9m00NIAd qX1Cw+4Cp7fOMwX+ibmEdMwokxcyD8ZAwXkOl0AmYNltePb+BQ/rT1noIPlC4azx4u 9kY7hKsasJ2hIwIkcys0QiQCiDEWcUbLOq2AT6mmGtReF/t3WiEiwwtt0NaeykGeLU 4eTxZz/otuSTG08WS9d7/3XgmsamfTLK0/DRAHq67bNiLZpBIKaOSaPDv9fu3jiVtl Y9nb9sehQL+/Q== Received: by phobos.denx.de (Postfix, from userid 109) id 71E5E83B23; Mon, 24 Oct 2022 15:55:41 +0200 (CEST) Received: from mail-out.m-online.net (mail-out.m-online.net [IPv6:2001:a60:0:28:0:1:25:1]) (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 B57A180F10 for ; Mon, 24 Oct 2022 15:55:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sbabic@denx.de Received: from frontend03.mail.m-online.net (unknown [192.168.6.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4MwxRK3Yvrz1s949; Mon, 24 Oct 2022 15:55:25 +0200 (CEST) Received: from localhost (dynscan3.mnet-online.de [192.168.6.84]) by mail.m-online.net (Postfix) with ESMTP id 4MwxRK3DYrz1qqlS; Mon, 24 Oct 2022 15:55:25 +0200 (CEST) X-Amavis-Alert: BAD HEADER SECTION, Missing required header field: "Date" Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan3.mail.m-online.net [192.168.6.84]) (amavisd-new, port 10024) with ESMTP id MIXevJ5yG1EG; Mon, 24 Oct 2022 15:55:24 +0200 (CEST) Received: from papero (host-88-217-136-221.customer.m-online.net [88.217.136.221]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 24 Oct 2022 15:55:24 +0200 (CEST) From: sbabic@denx.de X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1693303 X-Patchwork-Delegate: sbabic@denx.de To: Adam Ford ,u-boot@lists.denx.de Subject: [PATCH V2 3/7] arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot In-reply-to: <20221022005837.170357-4-aford173@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Message-Id: <20221024135541.71E5E83B23@phobos.denx.de> Date: Mon, 24 Oct 2022 15:55:27 +0200 (CEST) X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean > Now that a unified imx8mn-u-boot is available, remove duplicated > code for generating flash.bin and other common imx8mn peripherals. > Signed-off-by: Adam Ford > diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/d= ts/imx8mn-bsh-smm-s2-u-boot-common.dtsi > index c4ae7ca4f3..3967e0bd15 100644 > --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi > +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi > @@ -4,22 +4,7 @@ > * Copyright 2021 BSH Hausgeraete GmbH > */ > =20 > -/ { > - binman: binman { > - multiple-images; > - }; > - > - wdt-reboot { > - compatible =3D "wdt-reboot"; > - wdt =3D <&wdog1>; > - u-boot,dm-spl; > - }; > -}; > - > -&{/soc@0} { > - u-boot,dm-pre-reloc; > - u-boot,dm-spl; > -}; > +#include "imx8mn-u-boot.dtsi" > =20 > &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} { > u-boot,dm-spl; > @@ -29,27 +14,6 @@ > u-boot,dm-spl; > }; > =20 > -&aips1 { > - u-boot,dm-pre-reloc; > - u-boot,dm-spl; > -}; > - > -&aips3 { > - u-boot,dm-spl; > -}; > - > -&aips4 { > - u-boot,dm-spl; > -}; > - > -&clk { > - u-boot,dm-pre-reloc; > - u-boot,dm-spl; > - /delete-property/ assigned-clocks; > - /delete-property/ assigned-clock-parents; > - /delete-property/ assigned-clock-rates; > -}; > - > &gpio1 { > u-boot,dm-spl; > }; > @@ -66,15 +30,6 @@ > u-boot,dm-spl; > }; > =20 > -&iomuxc { > - u-boot,dm-spl; > -}; > - > -&osc_24m { > - u-boot,dm-pre-reloc; > - u-boot,dm-spl; > -}; > - > &pinctrl_i2c1 { > u-boot,dm-spl; > }; > @@ -98,128 +53,3 @@ > &wdog1 { > u-boot,dm-spl; > }; > - > -&binman { > - u-boot-spl-ddr { > - align =3D <4>; > - align-size =3D <4>; > - filename =3D "u-boot-spl-ddr.bin"; > - pad-byte =3D <0xff>; > - > - u-boot-spl { > - align-end =3D <4>; > - filename =3D "u-boot-spl.bin"; > - }; > - > - ddr-1d-imem-fw { > - filename =3D "ddr3_imem_1d.bin"; > - align-end =3D <4>; > - type =3D "blob-ext"; > - }; > - > - ddr-1d-dmem-fw { > - filename =3D "ddr3_dmem_1d.bin"; > - align-end =3D <4>; > - type =3D "blob-ext"; > - }; > - }; > - > - spl { > - filename =3D "spl.bin"; > - > - mkimage { > - args =3D "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000"; > - > - blob { > - filename =3D "u-boot-spl-ddr.bin"; > - }; > - }; > - }; > - > - itb { > - filename =3D "u-boot.itb"; > - > - fit { > - description =3D "Configuration to load ATF before U-Boot"; > - fit,external-offset =3D ; > - fit,fdt-list =3D "of-list"; > - #address-cells =3D <1>; > - > - images { > - uboot { > - arch =3D "arm64"; > - compression =3D "none"; > - description =3D "U-Boot (64-bit)"; > - load =3D ; > - type =3D "standalone"; > - > - uboot_blob { > - filename =3D "u-boot-nodtb.bin"; > - type =3D "blob-ext"; > - }; > - }; > - > - atf { > - arch =3D "arm64"; > - compression =3D "none"; > - description =3D "ARM Trusted Firmware"; > - entry =3D <0x960000>; > - load =3D <0x960000>; > - type =3D "firmware"; > - > - atf_blob { > - filename =3D "bl31.bin"; > - type =3D "atf-bl31"; > - }; > - }; > - > - binman_fip: fip { > - arch =3D "arm64"; > - compression =3D "none"; > - description =3D "Trusted Firmware FIP"; > - load =3D <0x40310000>; > - type =3D "firmware"; > - }; > - > - @fdt-SEQ { > - compression =3D "none"; > - description =3D "NAME"; > - type =3D "flat_dt"; > - > - uboot_fdt_blob { > - filename =3D "u-boot.dtb"; > - type =3D "blob-ext"; > - }; > - }; > - }; > - > - configurations { > - default =3D "@config-DEFAULT-SEQ"; > - > - binman_configuration: @config-SEQ { > - description =3D "NAME"; > - fdt =3D "fdt-SEQ"; > - firmware =3D "uboot"; > - loadables =3D "atf"; > - }; > - }; > - }; > - }; > - > - imx-boot { > - filename =3D "flash.bin"; > - pad-byte =3D <0x00>; > - > - spl { > - filename =3D "spl.bin"; > - offset =3D <0x0>; > - type =3D "blob-ext"; > - }; > - > - binman_uboot: uboot { > - filename =3D "u-boot.itb"; > - offset =3D <0x58000>; > - type =3D "blob-ext"; > - }; > - }; > -}; Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic --=20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D