[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Prafulla Wadaskar]

> -----Original Message-----
> From: Prafulla Wadaskar
> Sent: Saturday, June 11, 2011 9:53 AM
> To: 'Holger Brunck'; u-boot at lists.denx.de
> Cc: Valentin Longchamp; Heiko Schocher
> Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with
> km_kirkwood
> 
> 
> 
> > -----Original Message-----
> > From: Holger Brunck [mailto:holger.brunck at keymile.com]
> > Sent: Wednesday, June 08, 2011 5:13 PM
> > To: u-boot at lists.denx.de
> > Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko
> Schocher
> > Subject: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood
> >
> > suen3 and suen8 were in first HW version quite different, but
> > now they are from a u-boot point of view similar. So these
> > two boards can use the same header file. Other keymile boards
> > differ only in the usage of the PCI interface. Therefore
> > a target km_kirkwood_pci was introduced. All targets use
> > the same header file.
> >
> > Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> > cc: Prafulla Wadaskar <prafulla@marvell.com>
> > cc: Heiko Schocher <hs@denx.de>
> > ---
> > Changes for v2:
> >     - squashed together with 5/6 from previous serie, because
> >       the pci defines belongs logically to this patch
> >     - change typo in board maintainers name
> >
> >  MAINTAINERS                                |    6 ++-
> >  MAKEALL                                    |    2 +-
> >  boards.cfg                                 |    4 +-
> >  include/configs/km/km_arm.h                |    1 -
> >  include/configs/{suen3.h => km_kirkwood.h} |   18 +++++++---
> >  include/configs/mgcoge3un.h                |    5 +++
> >  include/configs/suen8.h                    |   50 -------------------
> --
> > -------
> 
> Applied to u-boot-marvell.git next branch
> Regards..
> Prafulla . .

Hi Holger, Valentin

During this pull check I observed that u-boot.kwb image generation gives build errors for all Kirkwood based keymile boards.

Please kindly check on this and provide a fix.

Regards..
Prafulla . .

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Longchamp, Valentin]

Hi Prafulla,

Sorry for the bad email formatting, using webmail from home. See my answer below.


-----Original Message-----
From: Prafulla Wadaskar [mailto:prafulla at marvell.com]
Sent: Sat 6/11/2011 6:50 AM
To: Brunck, Holger; u-boot at lists.denx.de
Cc: Longchamp, Valentin; Heiko Schocher
Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood
 


> -----Original Message-----
> From: Prafulla Wadaskar
> Sent: Saturday, June 11, 2011 9:53 AM
> To: 'Holger Brunck'; u-boot at lists.denx.de
> Cc: Valentin Longchamp; Heiko Schocher
> Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with
> km_kirkwood
> 
> 
> 
> > -----Original Message-----
> > From: Holger Brunck [mailto:holger.brunck at keymile.com]
> > Sent: Wednesday, June 08, 2011 5:13 PM
> > To: u-boot at lists.denx.de
> > Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko
> Schocher
> > Subject: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood
> >
> > suen3 and suen8 were in first HW version quite different, but
> > now they are from a u-boot point of view similar. So these
> > two boards can use the same header file. Other keymile boards
> > differ only in the usage of the PCI interface. Therefore
> > a target km_kirkwood_pci was introduced. All targets use
> > the same header file.
> >
> > Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> > cc: Prafulla Wadaskar <prafulla@marvell.com>
> > cc: Heiko Schocher <hs@denx.de>
> > ---
> > Changes for v2:
> >     - squashed together with 5/6 from previous serie, because
> >       the pci defines belongs logically to this patch
> >     - change typo in board maintainers name
> >
> >  MAINTAINERS                                |    6 ++-
> >  MAKEALL                                    |    2 +-
> >  boards.cfg                                 |    4 +-
> >  include/configs/km/km_arm.h                |    1 -
> >  include/configs/{suen3.h => km_kirkwood.h} |   18 +++++++---
> >  include/configs/mgcoge3un.h                |    5 +++
> >  include/configs/suen8.h                    |   50 -------------------
> --
> > -------
> 
> Applied to u-boot-marvell.git next branch
> Regards..
> Prafulla . .

Hi Holger, Valentin

During this pull check I observed that u-boot.kwb image generation gives build errors for all Kirkwood based keymile boards.

Please kindly check on this and provide a fix.

I had noticed about this u-boot.kwb image generation earlier, but we don't use it internally yet. We would like to change this and use it (and thus fix this error).

Could you please answer my early question from this thread: http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206

Here is my question again:

Now I have a question about the marvell boards build: I see in the 
Makefile that there is a rule about this kwb file, which is exactly what 
we do in our additionnal build script:

$(obj)u-boot.kwb:       $(obj)u-boot.bin
		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $

How do you use it (because I think it is not called by the default make 
command) ?

Best Regards

Valentin

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Simon Guinot]

Hi Valentin,

On Sun, Jun 12, 2011 at 02:09:24PM +0200, Longchamp, Valentin wrote:
> Now I have a question about the marvell boards build: I see in the 
> Makefile that there is a rule about this kwb file, which is exactly what 
> we do in our additionnal build script:
> 
> $(obj)u-boot.kwb:       $(obj)u-boot.bin
> 		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
> 		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $
> 
> How do you use it (because I think it is not called by the default make 
> command) ?

For my part, I simply use:

make ${obj_path}/u-boot.kwb

Regards,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
Url : http://lists.denx.de/pipermail/u-boot/attachments/20110612/113a8eeb/attachment.pgp 

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Prafulla Wadaskar]

> -----Original Message-----
> From: Longchamp, Valentin [mailto:Valentin.Longchamp at keymile.com]
> Sent: Sunday, June 12, 2011 5:39 PM
> To: Prafulla Wadaskar; Brunck, Holger; u-boot at lists.denx.de
> Cc: Heiko Schocher
> Subject: RE: [PATCH v2 4/5] arm/km: replace suenx targets with
> km_kirkwood
> 
> Hi Prafulla,
> 
> Sorry for the bad email formatting, using webmail from home. See my
> answer below.
> 
...snip...

> Hi Holger, Valentin
> 
> During this pull check I observed that u-boot.kwb image generation gives
> build errors for all Kirkwood based keymile boards.
> 
> Please kindly check on this and provide a fix.
> 
> I had noticed about this u-boot.kwb image generation earlier, but we
> don't use it internally yet. We would like to change this and use it
> (and thus fix this error).
> 
> Could you please answer my early question from this thread:
> http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206
> 
> Here is my question again:
> 
> Now I have a question about the marvell boards build: I see in the
> Makefile that there is a rule about this kwb file, which is exactly what
> we do in our additionnal build script:

You don't need to add additional build script for this.
Just make sure in your config you have configured CONFIG_SYS_KWD_CONFIG properly. It also have default configurations.

> 
> $(obj)u-boot.kwb:       $(obj)u-boot.bin
>                 $(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T
> kwbimage \
>                 -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d
> $< $
> 
> How do you use it (because I think it is not called by the default make
> command) ?

Make u-boot.kwb CROSS_COMPILE=..., with this u-boot.kwb (i.e. Kirkwood boot image) target will be generated.

This is the standard way the other targets are build in u-boot.

That's it.

Regards..
Prafulla . .

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Holger Brunck]

Hi Valentin, Prafulla,

On 12/06/11 14:09, Longchamp, Valentin wrote:
> 
> During this pull check I observed that u-boot.kwb image generation gives build errors for all Kirkwood based keymile boards.
> 
> Please kindly check on this and provide a fix.
> 
> I had noticed about this u-boot.kwb image generation earlier, but we don't use it internally yet. We would like to change this and use it (and thus fix this error).
> 
> Could you please answer my early question from this thread: http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206
> 
> Here is my question again:
> 
> Now I have a question about the marvell boards build: I see in the 
> Makefile that there is a rule about this kwb file, which is exactly what 
> we do in our additionnal build script:
> 
> $(obj)u-boot.kwb:       $(obj)u-boot.bin
> 		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
> 		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $
> 
> How do you use it (because I think it is not called by the default make 
> command) ?
> 

I simply execute  "make -s km_kirkwood u-boot.kwb" and then I see the error too. Yes our problem
was that we still use our litte make wrapper to build the kirkwood binary and therefore we didn't
saw the error. A simple make km_kirkwood works fine.

The bug was introduced due to commit 010a958b
(arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h)
there we try to use the already defined CONFIG_SYS_KWD_CONFIG in arch-kirkwood/config.h what is
quite this was we should do, but we forgot to include arch-kirkwood/config.h... And because we only
tested for build errors without u-boot.kwb it seems to be ok... 

So we should add this include and remove some of the defines which are part of arch-kirkwood/config.h
from our km_arm.h. But at one point we have to change arch-kirkwood/config.h. There is:

#ifdef CONFIG_CMD_I2C
#ifndef CONFIG_SOFT_I2C
#define CONFIG_I2C_MVTWSI
#define CONFIG_SYS_I2C_SLAVE           0x0

This wouldn't work for us because we have CONFIG_CMD_I2C enabled but we use SOFT_I2C and not HARD_I2C

I think it is correct if we change it to:
 #ifdef CONFIG_CMD_I2C
+#ifndef CONFIG_SOFT_I2C
 #define CONFIG_I2C_MVTWSI
+#endif
 #define CONFIG_SYS_I2C_SLAVE           0x0

Prafulla if you don't object to this change I would send a patch on tuesday when I'm back at work to
change this and to fix the build error.

Best regards
Holger

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Prafulla Wadaskar]

> -----Original Message-----
> From: Holger Brunck [mailto:holger.brunck at keymile.com]
> Sent: Monday, June 13, 2011 12:02 AM
> To: Longchamp, Valentin
> Cc: Prafulla Wadaskar; u-boot at lists.denx.de; Heiko Schocher
> Subject: Re: [PATCH v2 4/5] arm/km: replace suenx targets with
> km_kirkwood
> 
> Hi Valentin, Prafulla,
> 
> On 12/06/11 14:09, Longchamp, Valentin wrote:
> >
> > During this pull check I observed that u-boot.kwb image generation
> gives build errors for all Kirkwood based keymile boards.
> >
> > Please kindly check on this and provide a fix.
> >
> > I had noticed about this u-boot.kwb image generation earlier, but we
> don't use it internally yet. We would like to change this and use it
> (and thus fix this error).
> >
> > Could you please answer my early question from this thread:
> http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/99206
> >
> > Here is my question again:
> >
> > Now I have a question about the marvell boards build: I see in the
> > Makefile that there is a rule about this kwb file, which is exactly
> what
> > we do in our additionnal build script:
> >
> > $(obj)u-boot.kwb:       $(obj)u-boot.bin
> > 		$(obj)tools/mkimage -n $(CONFIG_SYS_KWD_CONFIG) -T kwbimage \
> > 		-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -d $< $
> >
> > How do you use it (because I think it is not called by the default
> make
> > command) ?
> >
> 
> I simply execute  "make -s km_kirkwood u-boot.kwb" and then I see the
> error too. Yes our problem
> was that we still use our litte make wrapper to build the kirkwood
> binary and therefore we didn't
> saw the error. A simple make km_kirkwood works fine.
> 
> The bug was introduced due to commit 010a958b
> (arm/km: remove CONFIG_SYS_KWD_CONFIG from keymile-common.h)
> there we try to use the already defined CONFIG_SYS_KWD_CONFIG in arch-
> kirkwood/config.h what is
> quite this was we should do, but we forgot to include arch-
> kirkwood/config.h... And because we only
> tested for build errors without u-boot.kwb it seems to be ok...
> 
> So we should add this include and remove some of the defines which are
> part of arch-kirkwood/config.h
> from our km_arm.h. But at one point we have to change arch-
> kirkwood/config.h. There is:
> 
> #ifdef CONFIG_CMD_I2C
> #ifndef CONFIG_SOFT_I2C
> #define CONFIG_I2C_MVTWSI
> #define CONFIG_SYS_I2C_SLAVE           0x0
> 
> This wouldn't work for us because we have CONFIG_CMD_I2C enabled but we
> use SOFT_I2C and not HARD_I2C
> 
> I think it is correct if we change it to:
>  #ifdef CONFIG_CMD_I2C
> +#ifndef CONFIG_SOFT_I2C
>  #define CONFIG_I2C_MVTWSI
> +#endif
>  #define CONFIG_SYS_I2C_SLAVE           0x0
> 
> Prafulla if you don't object to this change I would send a patch on
> tuesday when I'm back at work to
> change this and to fix the build error.

Hi Holger
Ack, Pls send the patch for the same. Also send a patch to resolve build error. May be those could be two standalone patches.

Regards..
Prafulla . .

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Holger Brunck]

Hi Prafulla,

On 06/13/2011 10:58 AM, Prafulla Wadaskar wrote:
>>
>> So we should add this include and remove some of the defines which are
>> part of arch-kirkwood/config.h
>> from our km_arm.h. But at one point we have to change arch-
>> kirkwood/config.h. There is:
>>
>> #ifdef CONFIG_CMD_I2C
>> #ifndef CONFIG_SOFT_I2C
>> #define CONFIG_I2C_MVTWSI
>> #define CONFIG_SYS_I2C_SLAVE           0x0
>>
>> This wouldn't work for us because we have CONFIG_CMD_I2C enabled but we
>> use SOFT_I2C and not HARD_I2C
>>
>> I think it is correct if we change it to:
>>  #ifdef CONFIG_CMD_I2C
>> +#ifndef CONFIG_SOFT_I2C
>>  #define CONFIG_I2C_MVTWSI
>> +#endif
>>  #define CONFIG_SYS_I2C_SLAVE           0x0
>>
>> Prafulla if you don't object to this change I would send a patch on
>> tuesday when I'm back at work to
>> change this and to fix the build error.
> 
> Hi Holger
> Ack, Pls send the patch for the same. Also send a patch to resolve build error. May be those could be two standalone patches.
> 

yes I prepare two patches. I fix this on top of current u-boot master and rebase
the patch serie on top of it. Maybe you want to send this fixes upstream for
inclusion in v2011.06...

Best regards
Holger

[U-Boot] [PATCH v2 0/5] updates for km ARM boards and board support for portl2

[Holger Brunck]

This is the second version of the patch serie with some reorganisation after some
comments of Prafulla Wadaskar the patch "arm/km: enable PCIE_INIT for Port-L2" was
split up into the "arm/km: replace suenx targets with km_kirkwood" and into the
board support patch for portl2. This board support patch is now patch 5/5.

Initial cover letter message:
Beside the board support some small cleanup was done and the phy_reset funtion
for mgcoge3un was implemented.

Additionaly the suen3 and suen8 target are collected in one
target km_kirkwood. For new targets which differ only in the
usage of the PCI interface on kirkwood a target km_kirkwood_pci
was introduced, but they use all the same header file.

All keymile boards compile cleanly and checkpatch reports no errors or
warnings. 

Holger Brunck (2):
  arm/km: remove unneeded define
  arm/km: replace suenx targets with km_kirkwood

Valentin Longchamp (3):
  arm/km: use board KM_ENV_BUS for CONFIG_I2C_ENV_EEPROM_BUS
  arm/km: ethernet support for mgcoge3un
  arm/km: add support for portl2 board

 MAINTAINERS                                |    7 ++-
 MAKEALL                                    |    3 +-
 board/keymile/km_arm/km_arm.c              |   45 ++++++++++++++-
 boards.cfg                                 |    5 +-
 include/configs/km/km_arm.h                |    5 +--
 include/configs/{suen3.h => km_kirkwood.h} |   18 +++++--
 include/configs/mgcoge3un.h                |    5 ++
 include/configs/portl2.h                   |   81 ++++++++++++++++++++++++++++
 include/configs/suen8.h                    |   50 -----------------
 9 files changed, 152 insertions(+), 67 deletions(-)
 rename include/configs/{suen3.h => km_kirkwood.h} (77%)
 create mode 100644 include/configs/portl2.h
 delete mode 100644 include/configs/suen8.h

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Holger Brunck]

suen3 and suen8 were in first HW version quite different, but
now they are from a u-boot point of view similar. So these
two boards can use the same header file. Other keymile boards
differ only in the usage of the PCI interface. Therefore
a target km_kirkwood_pci was introduced. All targets use
the same header file.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Heiko Schocher <hs@denx.de>
---
Changes for v2:
    - squashed together with 5/6 from previous serie, because
      the pci defines belongs logically to this patch
    - change typo in board maintainers name

 MAINTAINERS                                |    6 ++-
 MAKEALL                                    |    2 +-
 boards.cfg                                 |    4 +-
 include/configs/km/km_arm.h                |    1 -
 include/configs/{suen3.h => km_kirkwood.h} |   18 +++++++---
 include/configs/mgcoge3un.h                |    5 +++
 include/configs/suen8.h                    |   50 ----------------------------
 7 files changed, 25 insertions(+), 61 deletions(-)
 rename include/configs/{suen3.h => km_kirkwood.h} (77%)
 delete mode 100644 include/configs/suen8.h

diff --git a/MAINTAINERS b/MAINTAINERS
index c462ae2..d1ec392 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -726,6 +726,10 @@ Sergey Lapin <slapin@ossfans.org>
 
 	afeb9260	ARM926EJS (AT91SAM9260 SoC)
 
+Valentin Longchamp <valentin.longchamp@keymile.com>
+
+	km_kirkwood	ARM926EJS (Kirkwood SoC)
+
 Nishanth Menon <nm@ti.com>
 
 	omap3_sdp3430	ARM ARMV7 (OMAP3xx SoC)
@@ -814,8 +818,6 @@ Heiko Schocher <hs@denx.de>
 
 	magnesium	i.MX27
 	mgcoge3un	ARM926EJS (Kirkwood SoC)
-	suen3		ARM926EJS (Kirkwood SoC)
-	suen8		ARM926EJS (Kirkwood SoC)
 
 Robert Schwebel <r.schwebel@pengutronix.de>
 
diff --git a/MAKEALL b/MAKEALL
index d592374..1798303 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -347,6 +347,7 @@ LIST_ARM9="			\
 	guruplug		\
 	imx27lite		\
 	jadecpu			\
+	km_kirkwood		\
 	lpd7a400		\
 	magnesium		\
 	mv88f6281gtw_ge		\
@@ -373,7 +374,6 @@ LIST_ARM9="			\
 	spear310		\
 	spear320		\
 	spear600		\
-	suen3			\
 	trab			\
 	VCMA9			\
 	versatile		\
diff --git a/boards.cfg b/boards.cfg
index d2cacc8..6a50236 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -106,8 +106,8 @@ davinci_dvevm                arm         arm926ejs   dvevm               davinci
 davinci_schmoogie            arm         arm926ejs   schmoogie           davinci        davinci
 davinci_sffsdr               arm         arm926ejs   sffsdr              davinci        davinci
 davinci_sonata               arm         arm926ejs   sonata              davinci        davinci
-suen3                        arm         arm926ejs   km_arm              keymile        kirkwood
-suen8                        arm         arm926ejs   km_arm              keymile        kirkwood
+km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood:KM_DISABLE_PCI
+km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index d642ba1..c422d57 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -77,7 +77,6 @@
 #define CONFIG_MD5	/* get_random_hex on krikwood needs MD5 support */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 #define CONFIG_KIRKWOOD_EGIGA_INIT	/* Enable GbePort0/1 for kernel */
-#undef  CONFIG_KIRKWOOD_PCIE_INIT	/* Disable PCIE Port0 for kernel */
 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8	/* Set RGMII Pad voltage to 1.8V */
 
 #define CONFIG_MISC_INIT_R
diff --git a/include/configs/suen3.h b/include/configs/km_kirkwood.h
similarity index 77%
rename from include/configs/suen3.h
rename to include/configs/km_kirkwood.h
index 0f1b11e..e51b270 100644
--- a/include/configs/suen3.h
+++ b/include/configs/km_kirkwood.h
@@ -6,6 +6,9 @@
  * (C) Copyright 2009
  * Stefan Roese, DENX Software Engineering, sr at denx.de.
  *
+ * (C) Copyright 2011
+ * Holger Brunck, Keymile GmbH Hannover, holger.brunck at keymile.de
+ *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
@@ -30,8 +33,8 @@
  * http://lists.denx.de/pipermail/u-boot/2009-July/057350.html
  */
 
-#ifndef _CONFIG_SUEN3_H
-#define _CONFIG_SUEN3_H
+#ifndef _CONFIG_KM_KIRKWOOD_H
+#define _CONFIG_KM_KIRKWOOD_H
 
 /* include common defines/options for all arm based Keymile boards */
 #include "km/km_arm.h"
@@ -39,11 +42,16 @@
 /*
  * Version number information
  */
-#define CONFIG_IDENT_STRING	"\nKeymile SUEN3"
+#ifdef CONFIG_KM_DISABLE_PCI
+#define CONFIG_IDENT_STRING	"\nKeymile Kirkwood"
+#undef  CONFIG_KIRKWOOD_PCIE_INIT
+#else
+#define CONFIG_IDENT_STRING	"\nKeymile Kirkwood PCI"
+#endif
 
-#define CONFIG_HOSTNAME			suen3
+#define CONFIG_HOSTNAME			km_kirkwood
 
 #define KM_IVM_BUS	"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS	"pca9544a:70:d"	/* I2C2 (Mux-Port 5)*/
 
-#endif /* _CONFIG_SUEN3_H */
+#endif /* _CONFIG_KM_KIRKWOOD */
diff --git a/include/configs/mgcoge3un.h b/include/configs/mgcoge3un.h
index 6d56d7d..34bb192 100644
--- a/include/configs/mgcoge3un.h
+++ b/include/configs/mgcoge3un.h
@@ -75,4 +75,9 @@
 	MVGBE_SET_GMII_SPEED_TO_10_100	|\
 	MVGBE_SET_MII_SPEED_TO_100)
 
+/*
+ * PCIe port not used on mgcoge3un
+ */
+#undef  CONFIG_KIRKWOOD_PCIE_INIT
+
 #endif /* _CONFIG_MGCOGE3UN_H */
diff --git a/include/configs/suen8.h b/include/configs/suen8.h
deleted file mode 100644
index 78cee75..0000000
--- a/include/configs/suen8.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * (C) Copyright 2009
- * Marvell Semiconductor <www.marvell.com>
- * Prafulla Wadaskar <prafulla@marvell.com>
- *
- * (C) Copyright 2009
- * Stefan Roese, DENX Software Engineering, sr at denx.de.
- *
- * (C) Copyright 2010-2011
- * Holger Brunck, Keymile GmbH Hannover, holger.brunck at keymile.com.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-/* for linking errors see
- * http://lists.denx.de/pipermail/u-boot/2009-July/057350.html */
-
-#ifndef _CONFIG_SUEN8_H
-#define _CONFIG_SUEN8_H
-
-/* include common defines/options for all arm based Keymile boards */
-#include "km/km_arm.h"
-
-/*
- * Version number information
- */
-#define CONFIG_IDENT_STRING	"\nKeymile SUEN8"
-
-#define CONFIG_HOSTNAME			suen8
-
-#define KM_IVM_BUS	"pca9544a:70:9" /* I2C2 (Mux-Port 1)*/
-#define KM_ENV_BUS	"pca9544a:70:d" /* I2C2 (Mux-Port 5)*/
-
-#endif /* _CONFIG_SUEN8_H */
-- 
1.7.1

[U-Boot] [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood

[Prafulla Wadaskar]

> -----Original Message-----
> From: Holger Brunck [mailto:holger.brunck at keymile.com]
> Sent: Wednesday, June 08, 2011 5:13 PM
> To: u-boot at lists.denx.de
> Cc: Holger Brunck; Valentin Longchamp; Prafulla Wadaskar; Heiko Schocher
> Subject: [PATCH v2 4/5] arm/km: replace suenx targets with km_kirkwood
> 
> suen3 and suen8 were in first HW version quite different, but
> now they are from a u-boot point of view similar. So these
> two boards can use the same header file. Other keymile boards
> differ only in the usage of the PCI interface. Therefore
> a target km_kirkwood_pci was introduced. All targets use
> the same header file.
> 
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
> cc: Prafulla Wadaskar <prafulla@marvell.com>
> cc: Heiko Schocher <hs@denx.de>
> ---
> Changes for v2:
>     - squashed together with 5/6 from previous serie, because
>       the pci defines belongs logically to this patch
>     - change typo in board maintainers name
> 
>  MAINTAINERS                                |    6 ++-
>  MAKEALL                                    |    2 +-
>  boards.cfg                                 |    4 +-
>  include/configs/km/km_arm.h                |    1 -
>  include/configs/{suen3.h => km_kirkwood.h} |   18 +++++++---
>  include/configs/mgcoge3un.h                |    5 +++
>  include/configs/suen8.h                    |   50 ---------------------
> -------

Applied to u-boot-marvell.git next branch
Regards..
Prafulla . .