[PATCH] ARM: nitrogen6x: remove conflicting upstream SPI NOR partitions

[PATCH] ARM: nitrogen6x: remove conflicting upstream SPI NOR partitions

[Philipp Zabel]

Since kernel commit 44eac6ef3779 ("ARM: dts: imx6qdl-nitrogen6x: Add SPI
NOR partitions"), included in barebox commit a9c5f6b9ec88 ("dts: update
to v4.16-rc1"), the upstream device tree contains partition definitions
that conflict with preexisting barebox partitions:

  ERROR: m25p0.env: New partition m25p0.env conflicts with m25p0.barebox
  ERROR: m25p0.splash: New partition m25p0.splash conflicts with m25p0.barebox

Remove them so we can add the larger barebox and barebox-environment
partitions that are used since commit 3fb70de496b3 ("ARM: i.MX: increase
barebox partition sizes").

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
index 53fdb722d01a..5c43b16ab168 100644
--- a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
@@ -32,6 +32,9 @@
 		reg = <0x0 0xe0000>;
 	};
 
+	/delete-node/ partition@c0000;
+	/delete-node/ partition@c2000;
+
 	partition@e0000 {
 		label = "barebox-environment";
 		reg = <0xe0000 0x20000>;
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: nitrogen6x: remove conflicting upstream SPI NOR partitions

[Sascha Hauer]

On Thu, Jan 10, 2019 at 05:43:35PM +0100, Philipp Zabel wrote:
> Since kernel commit 44eac6ef3779 ("ARM: dts: imx6qdl-nitrogen6x: Add SPI
> NOR partitions"), included in barebox commit a9c5f6b9ec88 ("dts: update
> to v4.16-rc1"), the upstream device tree contains partition definitions
> that conflict with preexisting barebox partitions:
> 
>   ERROR: m25p0.env: New partition m25p0.env conflicts with m25p0.barebox
>   ERROR: m25p0.splash: New partition m25p0.splash conflicts with m25p0.barebox
> 
> Remove them so we can add the larger barebox and barebox-environment
> partitions that are used since commit 3fb70de496b3 ("ARM: i.MX: increase
> barebox partition sizes").
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox