Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
MIME-Version: 1.0
References: <20220321121728.414839-1-robert.marko@sartura.hr> <20220321134055.o3uz5al5np7fj273@pali>
In-Reply-To: <20220321134055.o3uz5al5np7fj273@pali>
From:   Robert Marko <robert.marko@sartura.hr>
Date:   Mon, 21 Mar 2022 14:59:18 +0100
Message-ID: <CA+HBbNE6ULsT1k7ZVsKk0JONsgYz50fzrrWb26_3LSs29p49Gw@mail.gmail.com>
Subject: Re: [PATCH 1/2] arm64: dts: uDPU: update partition table
To:     =?UTF-8?Q?Pali_Roh=C3=A1r?= <pali@kernel.org>
Cc:     Andrew Lunn <andrew@lunn.ch>, gregory.clement@bootlin.com,
        sebastian.hesselbarth@gmail.com, Rob Herring <robh+dt@kernel.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        devicetree <devicetree@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        =?UTF-8?B?TWFyZWsgQmVow7pu?= <marek.behun@nic.cz>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Mar 21, 2022 at 2:41 PM Pali Roh=C3=A1r <pali@kernel.org> wrote:
>
> On Monday 21 March 2022 13:17:27 Robert Marko wrote:
> > Partition currently called "uboot" does not only contain U-boot, but
> > rather it contains TF-A, U-boot and U-boot environment.
> >
> > So, to avoid accidentally deleting the U-boot environment which is
> > located at 0x180000 split the partition.
> >
> > "uboot" is not the correct name as you can't boot these boards with U-b=
oot
> > only, TF-A must be present as well, so rename the "uboot" partition to
> > "firmware".
> >
> > While we are here, describe the NOR node as "spi-flash@0" instead of
> > "m25p80@0" which is the old SPI-NOR driver name.
> >
> > Signed-off-by: Robert Marko <robert.marko@sartura.hr>
> > ---
> >  arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts | 13 +++++++++----
> >  1 file changed, 9 insertions(+), 4 deletions(-)
>
> FYI, U-Boot now contains copy of kernel's A3720 DTS files, so you should
> send same patch also to U-Boot project.

I am working on uDPU fixes for U-boot as well so it will get synced as
part of the series.
Regards,
Robert
>
> > diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/ar=
m64/boot/dts/marvell/armada-3720-uDPU.dts
> > index 95d46e8d081c..ac64949bb53e 100644
> > --- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> > +++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> > @@ -99,7 +99,7 @@ &spi0 {
> >       pinctrl-names =3D "default";
> >       pinctrl-0 =3D <&spi_quad_pins>;
> >
> > -     m25p80@0 {
> > +     spi-flash@0 {
> >               compatible =3D "jedec,spi-nor";
> >               reg =3D <0>;
> >               spi-max-frequency =3D <54000000>;
> > @@ -108,10 +108,15 @@ partitions {
> >                       compatible =3D "fixed-partitions";
> >                       #address-cells =3D <1>;
> >                       #size-cells =3D <1>;
> > -                     /* only bootloader is located on the SPI */
> > +
> >                       partition@0 {
> > -                             label =3D "uboot";
> > -                             reg =3D <0 0x400000>;
> > +                             label =3D "firmware";
> > +                             reg =3D <0x0 0x180000>;
> > +                     };
> > +
> > +                     partition@180000 {
> > +                             label =3D "u-boot-env";
> > +                             reg =3D <0x180000 0x10000>;
> >                       };
> >               };
> >       };
> > --
> > 2.35.1
> >


--=20
Robert Marko
Staff Embedded Linux Engineer
Sartura Ltd.
Lendavska ulica 16a
10000 Zagreb, Croatia
Email: robert.marko@sartura.hr
Web: www.sartura.hr