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.
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; };