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@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,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@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)*/ - -/* - * PCIe port not used on suen8 - */ -#undef CONFIG_KIRKWOOD_PCIE_INIT - -#endif /* _CONFIG_SUEN8_H */