[PATCH v1 07/26] imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux
Marcel Ziswiler
marcel at ziswiler.com
Thu Jul 21 15:27:29 CEST 2022
From: Marcel Ziswiler <marcel.ziswiler at toradex.com>
As a preparatory step remove the qspi node with its flash0 label as this
is already in the Linux upstream device tree.
This avoids the following error once synchronised:
+arch/arm/dts/imx6ul-14x14-evk.dtb: ERROR (duplicate_label):
/soc/bus at 2100000/spi at 21e0000/n25q256a at 0: Duplicate label 'flash0' on
/soc/bus at 2100000/spi at 21e0000/n25q256a at 0 and
/soc/bus at 2100000/spi at 21e0000/flash at 0
Signed-off-by: Marcel Ziswiler <marcel.ziswiler at toradex.com>
---
arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
index d0cbf79e33f..3bd6edb42e0 100644
--- a/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx6ul-14x14-evk-u-boot.dtsi
@@ -8,12 +8,6 @@
display0 = &lcdif;
};
-&qspi {
- flash0: n25q256a at 0 {
- compatible = "jedec,spi-nor";
- };
-};
-
&{/soc} {
u-boot,dm-pre-reloc;
};
--
2.35.1
More information about the U-Boot
mailing list