From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V22S1-0001dB-Pa for barebox@lists.infradead.org; Wed, 24 Jul 2013 17:02:10 +0000 Date: Wed, 24 Jul 2013 19:01:47 +0200 From: Sascha Hauer Message-ID: <20130724170147.GT9434@pengutronix.de> References: <1374241457-8565-1-git-send-email-jason@lakedaemon.net> <20130722072358.GD9434@pengutronix.de> <20130724143542.GE19736@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130724143542.GE19736@titan.lakedaemon.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] arm: mvebu: add board USI Topkick To: Jason Cooper Cc: barebox@lists.infradead.org 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 > > > --- > > > 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