Patchwork [U-Boot] RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG

login
register
mail settings
Submitter u-boot@lakedaemon.net
Date July 26, 2011, 9:19 p.m.
Message ID <1311715171-13128-5-git-send-email-u-boot@lakedaemon.net>
Download mbox | patch
Permalink /patch/106942/
State Not Applicable
Headers show

Comments

u-boot@lakedaemon.net - July 26, 2011, 9:19 p.m.
Signed-off-by: Jason Cooper <u-boot@lakedaemon.net>
---
 board/Marvell/dreamplug/dreamplug.c |    7 ++-----
 include/configs/dreamplug.h         |    2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)
Prafulla Wadaskar - July 27, 2011, 6:40 p.m.
> -----Original Message-----
> From: Jason Cooper [mailto:u-boot@lakedaemon.net]
> Sent: Wednesday, July 27, 2011 2:49 AM
> To: clint@debian.org; wd@denx.de; Prafulla Wadaskar
> Cc: u-boot@lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare; Siddarth
> Gore; bdale@gag.com; Jason Cooper
> Subject: RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG

Sorry about my related comments in patch 4/5, you can merge this patch to 4/5 to avoid confusion.

Regards..
Prafulla . .
u-boot@lakedaemon.net - July 28, 2011, 2:08 a.m.
On Wed, Jul 27, 2011 at 11:40:27AM -0700, Prafulla Wadaskar wrote:
> > -----Original Message-----
> > From: Jason Cooper [mailto:u-boot@lakedaemon.net]
> > Sent: Wednesday, July 27, 2011 2:49 AM
> > To: clint@debian.org; wd@denx.de; Prafulla Wadaskar
> > Cc: u-boot@lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare; Siddarth
> > Gore; bdale@gag.com; Jason Cooper
> > Subject: RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG
> 
> Sorry about my related comments in patch 4/5, you can merge this patch
> to 4/5 to avoid confusion.

See my comments in my reply to 4/5.  I'd like (if possible) to get this
merged before h*ll freezes over (Linux arm tree cleaned up).  So, I'm
trying to break the patch up into logical migration pieces.

Since every Dreamplug on the market sets and uses MACH_TYPE_GURUPLUG, I
think it's reasonable to use it (hopefully merged into u-boot) until the
linux-arm tree gets sorted out and they accept new boards / machids.
Then, the last patch can be added.

Am I way off base with that idea?

thx,

Jason.
Bdale Garbee - July 28, 2011, 7:25 a.m.
On Wed, 27 Jul 2011 22:08:23 -0400, Jason <u-boot@lakedaemon.net> wrote:
> Since every Dreamplug on the market sets and uses MACH_TYPE_GURUPLUG, I
> think it's reasonable to use it (hopefully merged into u-boot) until the
> linux-arm tree gets sorted out and they accept new boards / machids.
> Then, the last patch can be added.

If we're going to re-flash a bunch of Dreamplug units with new u-boot,
I'd prefer we go ahead and set a new id.  If that means we have to carry
around a local kernel patch for a while until the new id gets merged
into the kernel.org tree, that seems much easier to cope with than
having to flash yet another new u-boot later?

Bdale
u-boot@lakedaemon.net - July 28, 2011, 12:43 p.m.
On Thu, Jul 28, 2011 at 09:25:48AM +0200, Bdale Garbee wrote:
> On Wed, 27 Jul 2011 22:08:23 -0400, Jason <u-boot@lakedaemon.net> wrote:
> > Since every Dreamplug on the market sets and uses MACH_TYPE_GURUPLUG, I
> > think it's reasonable to use it (hopefully merged into u-boot) until the
> > linux-arm tree gets sorted out and they accept new boards / machids.
> > Then, the last patch can be added.
> 
> If we're going to re-flash a bunch of Dreamplug units with new u-boot,
> I'd prefer we go ahead and set a new id.  If that means we have to carry
> around a local kernel patch for a while until the new id gets merged
> into the kernel.org tree, that seems much easier to cope with than
> having to flash yet another new u-boot later?

I agree, which is why I included patch 5.  I've rebased my Linux
dreamplug patches against v3.0 and am doing some testing, Hopefully I
can push those out this weekend.  I'll add you folks to the CC when I do
that.

Do you think Linus, GregKH and others would flip if I suggested
arch/arm/staging/* ? ;-)

thx,

Jason.
Bdale Garbee - July 28, 2011, 1:44 p.m.
On Thu, 28 Jul 2011 08:43:53 -0400, Jason <u-boot@lakedaemon.net> wrote:
> I agree, which is why I included patch 5.  I've rebased my Linux
> dreamplug patches against v3.0 and am doing some testing, Hopefully I
> can push those out this weekend.  I'll add you folks to the CC when I do
> that.

Great, I'll look forward to them.  We're getting dangerously close to
having all the right bits in hand to issue an initial developer's image
for the Dreamplug on behalf of the FreedomBox Foundation.  Really
appreciate your timely help with this part!

> Do you think Linus, GregKH and others would flip if I suggested
> arch/arm/staging/* ? ;-)

;-)  

Bdale
Prafulla Wadaskar - July 28, 2011, 7:39 p.m.
> -----Original Message-----
> From: Jason [mailto:u-boot@lakedaemon.net]
> Sent: Thursday, July 28, 2011 7:38 AM
> To: Prafulla Wadaskar
> Cc: clint@debian.org; wd@denx.de; u-boot@lists.denx.de; Prabhanjan
> Sarnaik; Ashish Karkare; Siddarth Gore; bdale@gag.com
> Subject: Re: RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG
> 
> On Wed, Jul 27, 2011 at 11:40:27AM -0700, Prafulla Wadaskar wrote:
> > > -----Original Message-----
> > > From: Jason Cooper [mailto:u-boot@lakedaemon.net]
> > > Sent: Wednesday, July 27, 2011 2:49 AM
> > > To: clint@debian.org; wd@denx.de; Prafulla Wadaskar
> > > Cc: u-boot@lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare;
> Siddarth
> > > Gore; bdale@gag.com; Jason Cooper
> > > Subject: RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG
> >
> > Sorry about my related comments in patch 4/5, you can merge this patch
> > to 4/5 to avoid confusion.
> 
> See my comments in my reply to 4/5.  I'd like (if possible) to get this
> merged before h*ll freezes over (Linux arm tree cleaned up).  So, I'm
> trying to break the patch up into logical migration pieces.
> 
> Since every Dreamplug on the market sets and uses MACH_TYPE_GURUPLUG, I
> think it's reasonable to use it (hopefully merged into u-boot) until the
> linux-arm tree gets sorted out and they accept new boards / machids.
> Then, the last patch can be added.
> 
> Am I way off base with that idea?

So this is gating to provide dreamplug as separate board support or anther version for guruplug.

Regards..
Prafulla . .
u-boot@lakedaemon.net - July 29, 2011, 3:25 p.m.
On Thu, Jul 28, 2011 at 12:39:02PM -0700, Prafulla Wadaskar wrote:
> 
> 
> > -----Original Message-----
> > From: Jason [mailto:u-boot@lakedaemon.net]
> > Sent: Thursday, July 28, 2011 7:38 AM
> > To: Prafulla Wadaskar
> > Cc: clint@debian.org; wd@denx.de; u-boot@lists.denx.de; Prabhanjan
> > Sarnaik; Ashish Karkare; Siddarth Gore; bdale@gag.com
> > Subject: Re: RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG
> > 
> > On Wed, Jul 27, 2011 at 11:40:27AM -0700, Prafulla Wadaskar wrote:
> > > > -----Original Message-----
> > > > From: Jason Cooper [mailto:u-boot@lakedaemon.net]
> > > > Sent: Wednesday, July 27, 2011 2:49 AM
> > > > To: clint@debian.org; wd@denx.de; Prafulla Wadaskar
> > > > Cc: u-boot@lists.denx.de; Prabhanjan Sarnaik; Ashish Karkare;
> > Siddarth
> > > > Gore; bdale@gag.com; Jason Cooper
> > > > Subject: RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG
> > >
> > > Sorry about my related comments in patch 4/5, you can merge this patch
> > > to 4/5 to avoid confusion.
> > 
> > See my comments in my reply to 4/5.  I'd like (if possible) to get this
> > merged before h*ll freezes over (Linux arm tree cleaned up).  So, I'm
> > trying to break the patch up into logical migration pieces.
> > 
> > Since every Dreamplug on the market sets and uses MACH_TYPE_GURUPLUG, I
> > think it's reasonable to use it (hopefully merged into u-boot) until the
> > linux-arm tree gets sorted out and they accept new boards / machids.
> > Then, the last patch can be added.
> > 
> > Am I way off base with that idea?
> 
> So this is gating to provide dreamplug as separate board support or
> anther version for guruplug.

Separate board support.  I'm trying to work around the fact that
GlobalScale _didn't_ request / use a separate machid when they should
have.  They just reused MACH_TYPE_GURUPLUG. :-(

thx,

Jason.

Patch

diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index cdc094a..f848db7 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -104,11 +104,8 @@  int board_early_init_f(void)
 
 int board_init(void)
 {
-	/*
-	 * arch number of board
-	 * XXX: change to MACH_TYPE_DREAMPLUG once in Linux mainline.
-	 */
-	gd->bd->bi_arch_number = MACH_TYPE_GURUPLUG;
+	/* arch number of board */
+	gd->bd->bi_arch_number = MACH_TYPE_DREAMPLUG;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 2a908f4..4be2e59 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -39,7 +39,7 @@ 
 #define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
 #define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
-#define CONFIG_MACH_GURUPLUG	/* Machine type */
+#define CONFIG_MACH_DREAMPLUG	/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
 /*