aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Brunck <[holger.brunck@keymile.com]>2011-06-16 18:11:15 +0530
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-07-04 10:55:28 +0200
commit83b40c31466a2c0113686806767af7e163e69d1a (patch)
treefc86a13f8f636f203586dec20e08f4dd656f2117
parent8f2827fc43fe92c93875631c730cb9b54998d340 (diff)
downloadu-boot-linaro-stable-83b40c31466a2c0113686806767af7e163e69d1a.tar.gz
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>
-rw-r--r--MAINTAINERS6
-rwxr-xr-xMAKEALL2
-rw-r--r--boards.cfg4
-rw-r--r--include/configs/km_kirkwood.h (renamed from include/configs/suen3.h)18
-rw-r--r--include/configs/mgcoge3un.h5
-rw-r--r--include/configs/suen8.h50
6 files changed, 25 insertions, 60 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 416062485..40560b78a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -731,6 +731,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)
@@ -819,8 +823,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 e37000f64..9a2595d17 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 \
VCMA9 \
versatile \
versatileab \
diff --git a/boards.cfg b/boards.cfg
index 8b71a2cfd..6e5e5356d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -115,8 +115,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/suen3.h b/include/configs/km_kirkwood.h
index 0f1b11ea7..e51b270e1 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@denx.de.
*
+ * (C) Copyright 2011
+ * Holger Brunck, Keymile GmbH Hannover, holger.brunck@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 8d1b61f73..ac01a3120 100644
--- a/include/configs/mgcoge3un.h
+++ b/include/configs/mgcoge3un.h
@@ -76,4 +76,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 78cee7556..000000000
--- 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@denx.de.
- *
- * (C) Copyright 2010-2011
- * Holger Brunck, Keymile GmbH Hannover, holger.brunck@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 */