From: Samuel Holland <samuel@sholland.org>
To: Jagan Teki <jagan@amarulasolutions.com>,
Andre Przywara <andre.przywara@arm.com>
Cc: Jernej Skrabec <jernej.skrabec@siol.net>,
Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>,
U-Boot-Denx <u-boot@lists.denx.de>,
linux-sunxi <linux-sunxi@googlegroups.com>,
linux-sunxi@lists.linux.dev
Subject: Re: [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node
Date: Tue, 30 Mar 2021 08:51:48 -0500 [thread overview]
Message-ID: <912b7c69-fdac-8e2d-9d52-b28141beb299@sholland.org> (raw)
In-Reply-To: <CAMty3ZDpETzmE=1CRo2d3yT4FN0nSi7p+pvf8cLjBSwfu7Kpkg@mail.gmail.com>
On 3/30/21 8:28 AM, Jagan Teki wrote:
> On Tue, Mar 30, 2021 at 6:31 PM Andre Przywara <andre.przywara@arm.com> wrote:
>>
>> Trusted Firmware now adds the /reserved-memory subnode to the DT at
>> runtime[1], putting in the right values.
>>
>> Drop our hard-coded version, as this might clash with the actual values
>> (which have also changed), and rely on TF-A to add the node.
>>
>> [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770
>>
>> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Samuel Holland <samuel@sholland.org>
>> ---
>> arch/arm/dts/sun50i-h616.dtsi | 12 ------------
>> 1 file changed, 12 deletions(-)
>>
>> diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi
>> index 953e8fac20f..dd4d2f31111 100644
>> --- a/arch/arm/dts/sun50i-h616.dtsi
>> +++ b/arch/arm/dts/sun50i-h616.dtsi
>> @@ -51,18 +51,6 @@
>> };
>> };
>>
>> - reserved-memory {
>> - #address-cells = <2>;
>> - #size-cells = <2>;
>> - ranges;
>> -
>> - /* 512KiB reserved for ARM Trusted Firmware (BL31) */
>> - secmon_reserved: secmon@40000000 {
>> - reg = <0x0 0x40000000 0x0 0x80000>;
>> - no-map;
>> - };
>> - };
>> -
>
> As said always. it's better to not touch Linux dts files. If the same
> fix same available in Linux add SHA1 on the commit message otherwise
> keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar
> at least on sunxi.
This file has not yet been added to the Linux tree, so that rule does not apply
in this case.
Cheers,
Samuel
> Jagan.
>
WARNING: multiple messages have this Message-ID (diff)
From: Samuel Holland <samuel@sholland.org>
To: u-boot@lists.denx.de
Subject: [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node
Date: Tue, 30 Mar 2021 08:51:48 -0500 [thread overview]
Message-ID: <912b7c69-fdac-8e2d-9d52-b28141beb299@sholland.org> (raw)
In-Reply-To: <CAMty3ZDpETzmE=1CRo2d3yT4FN0nSi7p+pvf8cLjBSwfu7Kpkg@mail.gmail.com>
On 3/30/21 8:28 AM, Jagan Teki wrote:
> On Tue, Mar 30, 2021 at 6:31 PM Andre Przywara <andre.przywara@arm.com> wrote:
>>
>> Trusted Firmware now adds the /reserved-memory subnode to the DT at
>> runtime[1], putting in the right values.
>>
>> Drop our hard-coded version, as this might clash with the actual values
>> (which have also changed), and rely on TF-A to add the node.
>>
>> [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/7770
>>
>> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Samuel Holland <samuel@sholland.org>
>> ---
>> arch/arm/dts/sun50i-h616.dtsi | 12 ------------
>> 1 file changed, 12 deletions(-)
>>
>> diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi
>> index 953e8fac20f..dd4d2f31111 100644
>> --- a/arch/arm/dts/sun50i-h616.dtsi
>> +++ b/arch/arm/dts/sun50i-h616.dtsi
>> @@ -51,18 +51,6 @@
>> };
>> };
>>
>> - reserved-memory {
>> - #address-cells = <2>;
>> - #size-cells = <2>;
>> - ranges;
>> -
>> - /* 512KiB reserved for ARM Trusted Firmware (BL31) */
>> - secmon_reserved: secmon at 40000000 {
>> - reg = <0x0 0x40000000 0x0 0x80000>;
>> - no-map;
>> - };
>> - };
>> -
>
> As said always. it's better to not touch Linux dts files. If the same
> fix same available in Linux add SHA1 on the commit message otherwise
> keep /delete-node on -u-boot.dtsi. This how we are maintaining sofar
> at least on sunxi.
This file has not yet been added to the Linux tree, so that rule does not apply
in this case.
Cheers,
Samuel
> Jagan.
>
next prev parent reply other threads:[~2021-03-30 13:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-30 13:01 [For v2021.04] [PATCH 0/2] sunxi: last-minute H616 fixes Andre Przywara
2021-03-30 13:01 ` Andre Przywara
2021-03-30 13:01 ` [PATCH 1/2] sunxi: H616: Change TF-A load address to beginning of DRAM Andre Przywara
2021-03-30 13:01 ` Andre Przywara
2021-03-30 13:48 ` Samuel Holland
2021-03-30 13:48 ` Samuel Holland
2021-03-30 13:01 ` [PATCH 2/2] sunxi: dts: H616: Drop reserved-memory node Andre Przywara
2021-03-30 13:01 ` Andre Przywara
2021-03-30 13:28 ` Jagan Teki
2021-03-30 13:28 ` Jagan Teki
2021-03-30 13:51 ` Samuel Holland [this message]
2021-03-30 13:51 ` Samuel Holland
2021-03-30 14:05 ` Jagan Teki
2021-03-30 14:05 ` Jagan Teki
2021-03-30 14:13 ` Andre Przywara
2021-03-30 14:13 ` Andre Przywara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=912b7c69-fdac-8e2d-9d52-b28141beb299@sholland.org \
--to=samuel@sholland.org \
--cc=andre.przywara@arm.com \
--cc=jagan@amarulasolutions.com \
--cc=jernej.skrabec@siol.net \
--cc=linux-sunxi@googlegroups.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.