diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2019-01-10 17:43:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-11 12:06:57 +0100 |
| commit | 635cae0aad88d9fd179ea651ea9fce8156c3252a (patch) | |
| tree | a9955cfbaeba9d3fe299baf37f88fd7ef0e0f800 /arch | |
| parent | a50cb5f54a05e18fc8d7179f8705ed10f93c45d4 (diff) | |
| download | barebox-635cae0aad88d9fd179ea651ea9fce8156c3252a.tar.gz barebox-635cae0aad88d9fd179ea651ea9fce8156c3252a.tar.xz | |
ARM: nitrogen6x: remove conflicting upstream SPI NOR partitions
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx6qdl-nitrogen6x.dtsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi index 53fdb722d0..5c43b16ab1 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>; |