From: Sascha Hauer <s.hauer@pengutronix.de>
To: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH v1 08/10] MIPS: port all mach* to multiimage
Date: Mon, 26 Nov 2018 15:15:35 +0100 [thread overview]
Message-ID: <20181126141535.rkof7udeh75tfgw5@pengutronix.de> (raw)
In-Reply-To: <02814821-f042-06db-4cda-778e5a722273@pengutronix.de>
On Mon, Nov 26, 2018 at 02:54:17PM +0100, Oleksij Rempel wrote:
> On 26.11.18 14:01, Antony Pavlov wrote:
> > On Mon, 26 Nov 2018 10:18:05 +0100
> > Oleksij Rempel <o.rempel@pengutronix.de> wrote:
> >
> > Hi!
> >
> > I can't apply this patch.
> > Here is 'git am' log:
> >
> > Applying: MIPS: port all mach* to multiimage
> > .git/rebase-apply/patch:1291: trailing whitespace.
> > pbl-dtb-$(CONFIG_BOARD_8DEVICES_LIMA) += qca4531-8devices-lima.dtb.o
> > .git/rebase-apply/patch:1292: trailing whitespace.
> > pbl-dtb-$(CONFIG_BOARD_BLACK_SWIFT) += black-swift.dtb.o
> > .git/rebase-apply/patch:1294: trailing whitespace.
> > pbl-dtb-$(CONFIG_BOARD_DPTECHNICS_DPT_MODULE) += ar9331-dptechnics-dpt-module.dtb.o
> > .git/rebase-apply/patch:1298: trailing whitespace.
> > pbl-dtb-$(CONFIG_BOARD_TPLINK_MR3020) += tplink-mr3020.dtb.o
> > .git/rebase-apply/patch:1299: trailing whitespace.
> > pbl-dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += ar9344-tl-wdr4300-v1.7.dtb.o
> > error: patch failed: images/Makefile:53
> > error: images/Makefile: patch does not apply
> > Patch failed at 0001 MIPS: port all mach* to multiimage
> > hint: Use 'git am --show-current-patch' to see the failed patch
> > When you have resolved this problem, run "git am --continue".
> > If you prefer to skip this patch, run "git am --skip" instead.
> > To restore the original branch and stop patching, run "git am --abort".
>
> I pushed it to my github,
> https://github.com/olerem/barebox/tree/v2018.11.0/board/ath79-multiimage-20181126.1
>
> My patches + missing Sachas patches. It compiles and works at least on
> boards I was able to test.
I merged the piggy-pbl series into -next, so you can rebase on that now.
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
next prev parent reply other threads:[~2018-11-26 14:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 9:17 [PATCH v1 00/10] MIPS: migrate to multiimage support Oleksij Rempel
2018-11-26 9:17 ` [PATCH v1 01/10] images: piggy: use "a" instead of #alloc flag Oleksij Rempel
2018-11-26 12:25 ` Antony Pavlov
2018-11-26 13:00 ` Oleksij Rempel
2018-11-26 9:17 ` [PATCH v1 02/10] MIPS: add arch/mips/lib/pbl.lds.S Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 03/10] pbl: enable MIPS for PBL_RELOCATABLE Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 04/10] MIPS: start: preserve DTB pointer for later use Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 05/10] MIPS: multiimage: add ENTRY_FUNCTION macros Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 06/10] MIPS: mutliimage: pass devicetree from PBL to the main_entry Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 07/10] MIPS: put main_entry to __bare_init section Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 08/10] MIPS: port all mach* to multiimage Oleksij Rempel
2018-11-26 12:13 ` Antony Pavlov
2018-11-26 13:02 ` Oleksij Rempel
2018-11-26 13:01 ` Antony Pavlov
2018-11-26 13:54 ` Oleksij Rempel
2018-11-26 14:15 ` Sascha Hauer [this message]
2018-11-26 9:18 ` [PATCH v1 09/10] MIPS: remove HAS_NO_BOARD_HL_CODE support Oleksij Rempel
2018-11-26 9:18 ` [PATCH v1 10/10] MIPS: multiimage: remove useless board files Oleksij Rempel
2018-11-26 12:22 ` Antony Pavlov
2018-11-26 13:01 ` Oleksij Rempel
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=20181126141535.rkof7udeh75tfgw5@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=o.rempel@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