[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <6410439d-cc02-408f-bc8e-3d8e808b8e47@amd.com>
Date: Thu, 30 Nov 2023 09:01:16 +0100
From: Michal Simek <michal.simek@....com>
To: Rob Herring <robh@...nel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] arm64: dts: xilinx: Apply overlays to base dtbs
On 11/29/23 17:13, Rob Herring wrote:
> On Mon, Sep 18, 2023 at 5:56 AM Michal Simek <michal.simek@....com> wrote:
>>
>>
>>
>> On 9/11/23 23:47, Rob Herring wrote:
>>> DT overlays in tree need to be applied to a base DTB to validate they
>>> apply, to run schema checks on them, and to catch any errors at compile
>>> time. Defining the "-dtbs" variable is not enough as the combined DT must
>>> be added to dtbs-y.
>>>
>>> zynqmp-sck-kr-g-revA.dtso and zynqmp-sck-kr-g-revB.dtso don't exist, so drop
>>> them.
>>>
>>> Signed-off-by: Rob Herring <robh@...nel.org>
>>> ---
>>> arch/arm64/boot/dts/xilinx/Makefile | 9 ++++-----
>>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/xilinx/Makefile b/arch/arm64/boot/dts/xilinx/Makefile
>>> index 5e40c0b4fa0a..1068b0fa8e98 100644
>>> --- a/arch/arm64/boot/dts/xilinx/Makefile
>>> +++ b/arch/arm64/boot/dts/xilinx/Makefile
>>> @@ -22,11 +22,10 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA.dtb
>>> dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA.dtb
>>>
>>> zynqmp-sm-k26-revA-sck-kv-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo
>>> +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revA.dtb
>>> zynqmp-sm-k26-revA-sck-kv-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo
>>> +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k26-revA-sck-kv-g-revB.dtb
>>> zynqmp-smk-k26-revA-sck-kv-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revA.dtbo
>>> +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revA.dtb
>>> zynqmp-smk-k26-revA-sck-kv-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kv-g-revB.dtbo
>>> -
>>> -zynqmp-sm-k26-revA-sck-kr-g-revA-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo
>>> -zynqmp-sm-k26-revA-sck-kr-g-revB-dtbs := zynqmp-sm-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo
>>> -zynqmp-smk-k26-revA-sck-kr-g-revA-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revA.dtbo
>>> -zynqmp-smk-k26-revA-sck-kr-g-revB-dtbs := zynqmp-smk-k26-revA.dtb zynqmp-sck-kr-g-revB.dtbo
>>> +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k26-revA-sck-kv-g-revB.dtb
>>
>> Applied.
>
> Why is this in next still, but not in Linus' tree?
I was OOO and didn't send pull request to Arnd. I will do it for 6.8. It means
in 2-3 weeks from now.
Thanks,
Michal
Powered by blists - more mailing lists