[U-Boot] [PATCH 0/6] updates for keymile ARM boards

[U-Boot] [PATCH 0/6] updates for keymile ARM boards

[Holger Brunck]

Beside some small cleanup a new target portl2 is introduced.

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 an 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 (4):
  arm/km: add support for portl2 board
  arm/km: ethernet support for Port-L2 and mgcoge3un
  arm/km: use board KM_ENV_BUS for CONFIG_I2C_ENV_EEPROM_BUS
  arm/km: enable PCIE_INIT for Port-L2

 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 1/6] arm/km: remove unneeded define

[Holger Brunck]

CONFIG_ENV_SIZE for NAND was later in this file overwritten
because we have the environment in i2c eeprom, so remove
this define.

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>
---
 include/configs/km/km_arm.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 20ee6ea..5b0f1d8 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -50,7 +50,6 @@
 #include "keymile-common.h"
 
 #define CONFIG_SYS_TEXT_BASE	0x04000000	/* code address after reloc */
-#define CONFIG_ENV_SIZE		(128 << 10)	/* NAND chip block size	*/
 #define CONFIG_SYS_MEMTEST_START 0x00400000	/* 4M */
 #define CONFIG_SYS_MEMTEST_END	0x007fffff	/*(_8M -1) */
 #define CONFIG_SYS_LOAD_ADDR	0x00800000	/* default load adr- 8M */
@@ -215,7 +214,6 @@ int get_scl(void);
 #define CONFIG_ENV_EEPROM_IS_ON_I2C
 #define CONFIG_SYS_EEPROM_WREN
 #define CONFIG_ENV_OFFSET		0x0 /* no bracets! */
-#undef	CONFIG_ENV_SIZE
 #define CONFIG_ENV_SIZE			(0x2000 - CONFIG_ENV_OFFSET)
 #define CONFIG_I2C_ENV_EEPROM_BUS	"pca9547:70:d\0"
 
-- 
1.7.1

[U-Boot] [PATCH 2/6] arm/km: add support for portl2 board

[Holger Brunck]

From: Valentin Longchamp <valentin.longchamp@keymile.com>

This adds support for the keymile Kirkwood BEC portl2 board. This board
relies on the km_arm (km_kirkwood) BEC.

The egiga driver is configured for a 100M full-duplex, A/N off connnection
to the backplane.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Heiko Schocher <hs@denx.de>
---
 MAINTAINERS              |    4 ++
 MAKEALL                  |    1 +
 boards.cfg               |    1 +
 include/configs/portl2.h |   76 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 include/configs/portl2.h

diff --git a/MAINTAINERS b/MAINTAINERS
index c462ae2..c93a858 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -726,6 +726,10 @@ Sergey Lapin <slapin@ossfans.org>
 
 	afeb9260	ARM926EJS (AT91SAM9260 SoC)
 
+Valentine Longchamp <valentin.longchamp@keymile.com>
+
+	portl2		ARM926EJS (Kirkwood SoC)
+
 Nishanth Menon <nm@ti.com>
 
 	omap3_sdp3430	ARM ARMV7 (OMAP3xx SoC)
diff --git a/MAKEALL b/MAKEALL
index d592374..240ca35 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -363,6 +363,7 @@ LIST_ARM9="			\
 	openrd_base		\
 	openrd_client		\
 	openrd_ultimate		\
+	portl2			\
 	rd6281a			\
 	sbc2410x		\
 	scb9328			\
diff --git a/boards.cfg b/boards.cfg
index d2cacc8..b21b047 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -109,6 +109,7 @@ davinci_sonata               arm         arm926ejs   sonata              davinci
 suen3                        arm         arm926ejs   km_arm              keymile        kirkwood
 suen8                        arm         arm926ejs   km_arm              keymile        kirkwood
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood
+portl2                       arm         arm926ejs   km_arm              keymile        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
 openrd_base                  arm         arm926ejs   openrd              Marvell        kirkwood        openrd:BOARD_IS_OPENRD_BASE
diff --git a/include/configs/portl2.h b/include/configs/portl2.h
new file mode 100644
index 0000000..10ce7c8
--- /dev/null
+++ b/include/configs/portl2.h
@@ -0,0 +1,76 @@
+/*
+ * (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.
+ * Valentin Longchamp, Keymile AG Bern, valentin.longchamp 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_PORTL2_H
+#define _CONFIG_PORTL2_H
+
+/* include common defines/options for all arm based Keymile boards */
+#include "km/km_arm.h"
+
+/*
+ * Version number information
+ */
+#define CONFIG_IDENT_STRING	"\nKeymile Port-L2"
+#define CONFIG_HOSTNAME			portl2
+#define CONFIG_PORTL2
+
+#define KM_IVM_BUS	"pca9544a:70:9" /* I2C2 (Mux-Port 1)*/
+#define KM_ENV_BUS	"pca9544a:70:a" /* I2C2 (Mux-Port 2)*/
+
+/*
+ * portl2 has a fixed link to the XMPP backplane
+ * with 100MB full duplex and autoneg off, for this
+ * reason we have to change the default settings
+ */
+#define PORT_SERIAL_CONTROL_VALUE		( \
+	MVGBE_FORCE_LINK_PASS			| \
+	MVGBE_DIS_AUTO_NEG_FOR_DUPLX		| \
+	MVGBE_DIS_AUTO_NEG_FOR_FLOW_CTRL	| \
+	MVGBE_ADV_NO_FLOW_CTRL			| \
+	MVGBE_FORCE_FC_MODE_NO_PAUSE_DIS_TX	| \
+	MVGBE_FORCE_BP_MODE_NO_JAM		| \
+	(1 << 9) /* Reserved bit has to be 1 */	| \
+	MVGBE_DO_NOT_FORCE_LINK_FAIL		| \
+	MVGBE_DIS_AUTO_NEG_SPEED_GMII		| \
+	MVGBE_DTE_ADV_0				| \
+	MVGBE_MIIPHY_MAC_MODE			| \
+	MVGBE_AUTO_NEG_NO_CHANGE		| \
+	MVGBE_MAX_RX_PACKET_1552BYTE		| \
+	MVGBE_CLR_EXT_LOOPBACK			| \
+	MVGBE_SET_FULL_DUPLEX_MODE		| \
+	MVGBE_DIS_FLOW_CTRL_TX_RX_IN_FULL_DUPLEX	|\
+	MVGBE_SET_GMII_SPEED_TO_10_100	|\
+	MVGBE_SET_MII_SPEED_TO_100)
+
+#endif /* _CONFIG_PORTL2_H */
-- 
1.7.1

[U-Boot] [PATCH 2/6] arm/km: add support for portl2 board

[Prafulla Wadaskar]

> -----Original Message-----
> From: Holger Brunck [mailto:holger.brunck at keymile.com]
> Sent: Tuesday, June 07, 2011 4:16 PM
> To: u-boot at lists.denx.de
> Cc: Valentin Longchamp; Holger Brunck; Prafulla Wadaskar; Heiko Schocher
> Subject: [PATCH 2/6] arm/km: add support for portl2 board

Can you add this board support after this patch series or last patch in this series?

Regards..
Prafulla . .

[U-Boot] [PATCH 2/6] arm/km: add support for portl2 board

[Holger Brunck]

Hi Prafulla,

On 06/08/2011 10:35 AM, Prafulla Wadaskar wrote:
>> Subject: [PATCH 2/6] arm/km: add support for portl2 board
> 
> Can you add this board support after this patch series or last patch in this series?
> 

hm, 3/6 and 5/6 has dependencies to the portl2 support patch, but I think I can
handle this. So I will prepare an update serie 1/5 and a single patch for the
portl2 support ok? But only for my curiosity, what the reason for this need?

Best regards
Holger Brunck

[U-Boot] [PATCH 2/6] arm/km: add support for portl2 board

[Prafulla Wadaskar]

> -----Original Message-----
> From: Holger Brunck [mailto:holger.brunck at keymile.com]
> Sent: Wednesday, June 08, 2011 2:36 PM
> To: Prafulla Wadaskar
> Cc: u-boot at lists.denx.de; Valentin Longchamp; Heiko Schocher
> Subject: Re: [PATCH 2/6] arm/km: add support for portl2 board
> 
> Hi Prafulla,
> 
> On 06/08/2011 10:35 AM, Prafulla Wadaskar wrote:
> >> Subject: [PATCH 2/6] arm/km: add support for portl2 board
> >
> > Can you add this board support after this patch series or last patch
> in this series?
> >
> 
> hm, 3/6 and 5/6 has dependencies to the portl2 support patch, but I
> think I can
> handle this. So I will prepare an update serie 1/5 and a single patch
> for the
> portl2 support ok? But only for my curiosity, what the reason for this
> need?
> 

:-)
To me a patch series looks like updates/corrections to the existing code.
Whereas new board support is addition, should be on the top of it.
So let's keep them separate for better understanding.

Regards..
Prafulla . . 

[U-Boot] [PATCH 2/6] arm/km: add support for portl2 board

[Holger Brunck]

Hi Prafulla,

>> On 06/08/2011 10:35 AM, Prafulla Wadaskar wrote:
>>>> Subject: [PATCH 2/6] arm/km: add support for portl2 board
>>>
>>> Can you add this board support after this patch series or last patch
>> in this series?
>>>
>>
>> hm, 3/6 and 5/6 has dependencies to the portl2 support patch, but I
>> think I can
>> handle this. So I will prepare an update serie 1/5 and a single patch
>> for the
>> portl2 support ok? But only for my curiosity, what the reason for this
>> need?
>>
> 
> :-)
> To me a patch series looks like updates/corrections to the existing code.
> Whereas new board support is addition, should be on the top of it.
> So let's keep them separate for better understanding.
> 

yes but in this case the board support patch will not work separated from the
updates. You won't be able to commit the single board support patch before
comitting the updates, so logically they belong together. Therefore I think it
is the best if I follow your first advice and place the board support patch at
the end of the serie.

Best regards
Holger

[U-Boot] [PATCH 2/6] arm/km: add support for portl2 board

[Prafulla Wadaskar]

> -----Original Message-----
> From: Holger Brunck [mailto:holger.brunck at keymile.com]
> Sent: Wednesday, June 08, 2011 4:06 PM
> To: Prafulla Wadaskar
> Cc: u-boot at lists.denx.de; Valentin Longchamp; Heiko Schocher
> Subject: Re: [PATCH 2/6] arm/km: add support for portl2 board
> 
> Hi Prafulla,
> 
> >> On 06/08/2011 10:35 AM, Prafulla Wadaskar wrote:
> >>>> Subject: [PATCH 2/6] arm/km: add support for portl2 board
> >>>
> >>> Can you add this board support after this patch series or last patch
> >> in this series?
> >>>
> >>
> >> hm, 3/6 and 5/6 has dependencies to the portl2 support patch, but I
> >> think I can
> >> handle this. So I will prepare an update serie 1/5 and a single patch
> >> for the
> >> portl2 support ok? But only for my curiosity, what the reason for
> this
> >> need?
> >>
> >
> > :-)
> > To me a patch series looks like updates/corrections to the existing
> code.
> > Whereas new board support is addition, should be on the top of it.
> > So let's keep them separate for better understanding.
> >
> 
> yes but in this case the board support patch will not work separated
> from the
> updates. You won't be able to commit the single board support patch
> before
> comitting the updates, so logically they belong together. Therefore I
> think it
> is the best if I follow your first advice and place the board support
> patch at
> the end of the serie.

Sure..
Regards..
Prafulla . .

[U-Boot] [PATCH 3/6] arm/km: ethernet support for Port-L2 and mgcoge3un

[Holger Brunck]

From: Valentin Longchamp <valentin.longchamp@keymile.com>

No piggy board is used here and the phy is always present, so we use
the ethernet_present from mgcoge3un where this is similar.
The phy is also configured with "RGMII clock transitions when data
stable" and "Class A driver for the direct backplane connection".

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Heiko Schocher <hs@denx.de>
---
 board/keymile/km_arm/km_arm.c |   45 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index d86acc9..5da856f 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -130,10 +130,12 @@ int startup_allowed(void)
 			return 1;
 	return 0;
 }
+#endif
 
+#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2))
 /*
- * mgcoge3un has always ethernet present. Its connected to the 6061 switch
- * and provides ICNev and piggy4 connections.
+ * These two boards have always ethernet present. Its connected to the mv
+ * switch.
  */
 int ethernet_present(void)
 {
@@ -335,7 +337,42 @@ void dram_init_banksize(void)
 	}
 }
 
-/* Configure and enable MV88E1118 PHY */
+#if (defined(CONFIG_MGCOGE3UN)|defined(CONFIG_PORTL2))
+
+#define	PHY_LED_SEL	0x18
+#define PHY_LED0_LINK	(0x5)
+#define PHY_LED1_ACT	(0x8<<4)
+#define PHY_LED2_INT	(0xe<<8)
+#define	PHY_SPEC_CTRL	0x1c
+#define PHY_RGMII_CLK_STABLE	(0x1<<10)
+#define PHY_CLSA	(0x1<<1)
+
+/* Configure and enable MV88E3018 PHY */
+void reset_phy(void)
+{
+	char *name = "egiga0";
+	unsigned short reg;
+
+	if (miiphy_set_current_dev(name))
+		return;
+
+	/* RGMII clk transition on data stable */
+	if (miiphy_read(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL, &reg) != 0)
+		printf("Error reading PHY spec ctrl reg\n");
+	if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL,
+		reg | PHY_RGMII_CLK_STABLE | PHY_CLSA) != 0)
+		printf("Error writing PHY spec ctrl reg\n");
+
+	/* leds setup */
+	if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_LED_SEL,
+		PHY_LED0_LINK | PHY_LED1_ACT | PHY_LED2_INT) != 0)
+		printf("Error writing PHY LED reg\n");
+
+	/* reset the phy */
+	miiphy_reset(name, CONFIG_PHY_BASE_ADR);
+}
+#else
+/* Configure and enable MV88E1118 PHY on the piggy*/
 void reset_phy(void)
 {
 	char *name = "egiga0";
@@ -346,6 +383,8 @@ void reset_phy(void)
 	/* reset the phy */
 	miiphy_reset(name, CONFIG_PHY_BASE_ADR);
 }
+#endif
+
 
 #if defined(CONFIG_HUSH_INIT_VAR)
 int hush_init_var(void)
-- 
1.7.1

[U-Boot] [PATCH 4/6] arm/km: use board KM_ENV_BUS for CONFIG_I2C_ENV_EEPROM_BUS

[Holger Brunck]

From: Valentin Longchamp <valentin.longchamp@keymile.com>

This is defined for all km_kirkwood boards and was not used up to now.
This value was the same for all boards but it could be changed for some
boards (and thus needs to be defined for every board).

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Heiko Schocher <hs@denx.de>
---
 include/configs/km/km_arm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 5b0f1d8..d642ba1 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -215,7 +215,7 @@ int get_scl(void);
 #define CONFIG_SYS_EEPROM_WREN
 #define CONFIG_ENV_OFFSET		0x0 /* no bracets! */
 #define CONFIG_ENV_SIZE			(0x2000 - CONFIG_ENV_OFFSET)
-#define CONFIG_I2C_ENV_EEPROM_BUS	"pca9547:70:d\0"
+#define CONFIG_I2C_ENV_EEPROM_BUS	KM_ENV_BUS "\0"
 
 /* offset redund: (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-- 
1.7.1

[U-Boot] [PATCH 5/6] arm/km: enable PCIE_INIT for Port-L2

[Holger Brunck]

From: Valentin Longchamp <valentin.longchamp@keymile.com>

Port-L2 uses PCIE. So move the undef of this option from generic
km_arm.h to the board specific header.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
cc: Heiko Schocher <hs@denx.de>
---
 include/configs/km/km_arm.h |    1 -
 include/configs/mgcoge3un.h |    5 +++++
 include/configs/portl2.h    |    5 +++++
 include/configs/suen3.h     |    5 +++++
 include/configs/suen8.h     |    5 +++++
 5 files changed, 20 insertions(+), 1 deletions(-)

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/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/portl2.h b/include/configs/portl2.h
index 10ce7c8..a8543a5 100644
--- a/include/configs/portl2.h
+++ b/include/configs/portl2.h
@@ -73,4 +73,9 @@
 	MVGBE_SET_GMII_SPEED_TO_10_100	|\
 	MVGBE_SET_MII_SPEED_TO_100)
 
+/*
+ * portl2 does use the PCIe Port0
+ */
+#define  CONFIG_KIRKWOOD_PCIE_INIT
+
 #endif /* _CONFIG_PORTL2_H */
diff --git a/include/configs/suen3.h b/include/configs/suen3.h
index 0f1b11e..7f6e95f 100644
--- a/include/configs/suen3.h
+++ b/include/configs/suen3.h
@@ -46,4 +46,9 @@
 #define KM_IVM_BUS	"pca9544a:70:9"	/* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS	"pca9544a:70:d"	/* I2C2 (Mux-Port 5)*/
 
+/*
+ * PCIe port not used on suen8
+ */
+#undef  CONFIG_KIRKWOOD_PCIE_INIT
+
 #endif /* _CONFIG_SUEN3_H */
diff --git a/include/configs/suen8.h b/include/configs/suen8.h
index 78cee75..d3d9b5c 100644
--- a/include/configs/suen8.h
+++ b/include/configs/suen8.h
@@ -47,4 +47,9 @@
 #define KM_IVM_BUS	"pca9544a:70:9" /* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS	"pca9544a:70:d" /* I2C2 (Mux-Port 5)*/
 
+/*
+ * PCIe port not used on suen8
+ */
+#undef  CONFIG_KIRKWOOD_PCIE_INIT
+
 #endif /* _CONFIG_SUEN8_H */
-- 
1.7.1

[U-Boot] [PATCH 6/6] 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>
---
 MAINTAINERS                                |    3 +-
 MAKEALL                                    |    2 +-
 boards.cfg                                 |    4 +-
 include/configs/{suen3.h => km_kirkwood.h} |   23 +++++++-----
 include/configs/suen8.h                    |   55 ----------------------------
 5 files changed, 17 insertions(+), 70 deletions(-)
 rename include/configs/{suen3.h => km_kirkwood.h} (79%)
 delete mode 100644 include/configs/suen8.h

diff --git a/MAINTAINERS b/MAINTAINERS
index c93a858..f8dea86 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -728,6 +728,7 @@ Sergey Lapin <slapin@ossfans.org>
 
 Valentine Longchamp <valentin.longchamp@keymile.com>
 
+	km_kirkwood	ARM926EJS (Kirkwood SoC)
 	portl2		ARM926EJS (Kirkwood SoC)
 
 Nishanth Menon <nm@ti.com>
@@ -818,8 +819,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 240ca35..3f92449 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -347,6 +347,7 @@ LIST_ARM9="			\
 	guruplug		\
 	imx27lite		\
 	jadecpu			\
+	km_kirkwood		\
 	lpd7a400		\
 	magnesium		\
 	mv88f6281gtw_ge		\
@@ -374,7 +375,6 @@ LIST_ARM9="			\
 	spear310		\
 	spear320		\
 	spear600		\
-	suen3			\
 	trab			\
 	VCMA9			\
 	versatile		\
diff --git a/boards.cfg b/boards.cfg
index b21b047..649f1af 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
 portl2                       arm         arm926ejs   km_arm              keymile        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
diff --git a/include/configs/suen3.h b/include/configs/km_kirkwood.h
similarity index 79%
rename from include/configs/suen3.h
rename to include/configs/km_kirkwood.h
index 7f6e95f..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,16 +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)*/
 
-/*
- * PCIe port not used on suen8
- */
-#undef  CONFIG_KIRKWOOD_PCIE_INIT
-
-#endif /* _CONFIG_SUEN3_H */
+#endif /* _CONFIG_KM_KIRKWOOD */
diff --git a/include/configs/suen8.h b/include/configs/suen8.h
deleted file mode 100644
index d3d9b5c..0000000
--- a/include/configs/suen8.h
+++ /dev/null
@@ -1,55 +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)*/
-
-/*
- * PCIe port not used on suen8
- */
-#undef  CONFIG_KIRKWOOD_PCIE_INIT
-
-#endif /* _CONFIG_SUEN8_H */
-- 
1.7.1