mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jason Cooper <jason@lakedaemon.net>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] arm: mvebu: add board USI Topkick
Date: Wed, 24 Jul 2013 19:01:47 +0200	[thread overview]
Message-ID: <20130724170147.GT9434@pengutronix.de> (raw)
In-Reply-To: <20130724143542.GE19736@titan.lakedaemon.net>

On Wed, Jul 24, 2013 at 10:35:42AM -0400, Jason Cooper wrote:
> Sascha,
> 
> On Mon, Jul 22, 2013 at 09:23:58AM +0200, Sascha Hauer wrote:
> > On Fri, Jul 19, 2013 at 01:44:17PM +0000, Jason Cooper wrote:
> > > Successfully boots to console via kwboot.  No other functionality yet.
> > > 
> > > Signed-off-by: Jason Cooper <jason@lakedaemon.net>
> > > ---
> > >  arch/arm/Makefile                        |  1 +
> > >  arch/arm/boards/usi-topkick/Makefile     |  1 +
> > >  arch/arm/boards/usi-topkick/board.c      | 17 ++++++++++++++++
> > >  arch/arm/boards/usi-topkick/kwbimage.cfg | 35 ++++++++++++++++++++++++++++++++
> > >  arch/arm/mach-mvebu/Kconfig              |  5 +++++
> > >  5 files changed, 59 insertions(+)
> > >  create mode 100644 arch/arm/boards/usi-topkick/Makefile
> > >  create mode 100644 arch/arm/boards/usi-topkick/board.c
> > >  create mode 100644 arch/arm/boards/usi-topkick/kwbimage.cfg
> > > 
> > > diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> > > index 32bdd65..96c9a67 100644
> > > --- a/arch/arm/Makefile
> > > +++ b/arch/arm/Makefile
> > > @@ -170,6 +170,7 @@ board-$(CONFIG_MACH_TX53)			+= karo-tx53
> > >  board-$(CONFIG_MACH_USB_A9260)			+= usb-a926x
> > >  board-$(CONFIG_MACH_USB_A9263)			+= usb-a926x
> > >  board-$(CONFIG_MACH_USB_A9G20)			+= usb-a926x
> > > +board-$(CONFIG_MACH_USI_TOPKICK)		+= usi-topkick
> > 
> > Please do not add items to this list. Use arch/arm/boards/Makefile
> > instead. I fixed this while applying.
> 
> Yes, that was how I originally had it when I was based off of
> origin/master.  However, I encountered the error where I needed to add
> BOARD=... to the make command in order to build properly.  Realizing
> that one should always base off of a tag, I then rebased off of
> v2013.07.0, which doesn't contain
> 
>   6bbb24c ARM: Turn most board directories into regular build directories
> 
> In the future, just let me know if you want me to rebase off of a
> branch.  No need to hand edit things on your side.

If possible, base your branches on master. If that requires resolving
some merge conflicts on my side that's fine. Only if you know that your
patches need something from -next base them on -next.

I rebuild the -next branch from topic branches frequently. This means
for me that I can easily drop patches from -next, but it also means that
I have to hand edit patches from time to time and resolve merge
conflicts. That's ok for me.

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

      reply	other threads:[~2013-07-24 17:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19 13:44 Jason Cooper
2013-07-19 14:06 ` Jason Cooper
2013-07-22  7:23 ` Sascha Hauer
2013-07-24 14:35   ` Jason Cooper
2013-07-24 17:01     ` 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=20130724170147.GT9434@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=jason@lakedaemon.net \
    /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