From: Sascha Hauer <s.hauer@pengutronix.de>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: nitrogen6x: remove conflicting upstream SPI NOR partitions
Date: Fri, 11 Jan 2019 12:07:13 +0100 [thread overview]
Message-ID: <20190111110713.44lzu7ulhxnnfcoz@pengutronix.de> (raw)
In-Reply-To: <20190110164335.2970-1-p.zabel@pengutronix.de>
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
prev parent reply other threads:[~2019-01-11 11:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 16:43 Philipp Zabel
2019-01-11 11:07 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190111110713.44lzu7ulhxnnfcoz@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox