Some other kirkwood boards from keymile will follow. They will have some
small differences, but we want to use the km_kirkwood.h for all to
distinguish them. This patch a preparation for this.
Signed-off-by: Holger Brunck <holger.bru...@keymile.com>
cc: Valentin Longchamp <valentin.longch...@keymile.com>
cc: Gerlando Falauto <gerlando.fala...@keymile.com>
cc: Prafulla Wadaskar <prafu...@marvell.com>
---
boards.cfg | 4 ++--
include/configs/km_kirkwood.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/boards.cfg b/boards.cfg
index 28cc345..08ac582 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -137,8 +137,8 @@ hawkboard_uart arm arm926ejs
da8xxevm davinci
enbw_cmc arm arm926ejs enbw_cmc enbw
davinci
calimain arm arm926ejs calimain
omicron davinci
dns325 arm arm926ejs -
d-link 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:KM_RECONFIG_XLX
+km_kirkwood arm arm926ejs km_arm
keymile kirkwood km_kirkwood:KM_KIRKWOOD,KM_DISABLE_PCI
+km_kirkwood_pci arm arm926ejs km_arm
keymile kirkwood km_kirkwood:KM_KIRKWOOD_PCI,KM_RECONFIG_XLX
mgcoge3un arm arm926ejs km_arm
keymile kirkwood
portl2 arm arm926ejs km_arm
keymile kirkwood
inetspace_v2 arm arm926ejs netspace_v2 LaCie
kirkwood lacie_kw:INETSPACE_V2
diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index ed36124..f639edc 100644
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -42,10 +42,10 @@
/*
* Version number information
*/
-#ifdef CONFIG_KM_DISABLE_PCI
+#if defined(CONFIG_KM_KIRKWOOD)
#define CONFIG_IDENT_STRING "\nKeymile Kirkwood"
#undef CONFIG_KIRKWOOD_PCIE_INIT
-#else
+#elif defined(CONFIG_KM_KIRKWOOD_PCI)
#define CONFIG_IDENT_STRING "\nKeymile Kirkwood PCI"
#endif
--
1.7.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
