[PATCH] arm: mvebu: add board USI Topkick

[Sascha Hauer]

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 at 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 |