[PATCH v1 07/26] imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux
> From: Marcel Ziswiler > 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@210/spi@21e/n25q256a@0: Duplicate label 'flash0' on > /soc/bus@210/spi@21e/n25q256a@0 and > /soc/bus@210/spi@21e/flash@0 > Signed-off-by: Marcel Ziswiler Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic -- = DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sba...@denx.de =
[PATCH v1 07/26] imx: mx6ul_14x14_evk: prepare to synchronise device trees with linux
From: Marcel Ziswiler
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@210/spi@21e/n25q256a@0: Duplicate label 'flash0' on
/soc/bus@210/spi@21e/n25q256a@0 and
/soc/bus@210/spi@21e/flash@0
Signed-off-by: Marcel Ziswiler
---
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 =
};
- {
- flash0: n25q256a@0 {
- compatible = "jedec,spi-nor";
- };
-};
-
&{/soc} {
u-boot,dm-pre-reloc;
};
--
2.35.1
