On Thu, 2022-07-21 at 19:20 +0200, Soeren Moch wrote:
On 21.07.22 15:27, Marcel Ziswiler wrote:
From: Marcel Ziswiler marcel.ziswiler@toradex.com
As a preparatory step make sure to refer to absolute node paths where labels were removed in Linux upstream.
Are you sure that this was removed upstream?
Well, removed or never been there and still not there up to and including latest v5.19-rc7.
It was just submitted for inclusion [1], and may not have landed yet.
Oh, okay. No, haven't seen that one yet. So it might make sense to re-base everything on latest -next then which would no longer require such change. Let me re-work this in a v2. Thanks!
Regards, Soeren
Cheers
Marcel
[1] https://lore.kernel.org/linux-arm-kernel/20220620003736.GN254723@dragon/T/
This avoids the following error once synchronised:
+Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:3.1-7 Label or path aips1 not found +Error: arch/arm/dts/imx6q-tbs2910-u-boot.dtsi:11.1-5 Label or path soc not found
Signed-off-by: Marcel Ziswiler marcel.ziswiler@toradex.com
arch/arm/dts/imx6q-tbs2910-u-boot.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi index 65ab052ac2c..d48719e7d59 100644 --- a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi +++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+
-&aips1 { +&{/soc/bus@2000000} { /* AIPS1 */ u-boot,dm-pre-reloc; };
@@ -8,7 +8,7 @@ u-boot,dm-pre-reloc; };
-&soc { +&{/soc} { u-boot,dm-pre-reloc; };