Signed-off-by: Victor Gallardo <[EMAIL PROTECTED]>
---
v2:
- remove arches.c and instead use canyonlands.c
- remove reference to IBM_NEW_EMAC_RGMII for ARCHES config
- remove reference to IBM_NEW_EMAC_ZMII for ARCHES config
- moved reference to IBM_NEW_EMAC_RGMII under CANYONLANDS config
- moved reference to IBM_NEW_EMAC_ZMII under CANYONLANDS config
arch/powerpc/platforms/44x/Kconfig | 18 ++++++++++++++----
arch/powerpc/platforms/44x/Makefile | 1 +
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/44x/Kconfig
b/arch/powerpc/platforms/44x/Kconfig
index 249ba01..be1bce7 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -83,9 +83,23 @@ config CANYONLANDS
select 460EX
select PCI
select PPC4xx_PCI_EXPRESS
+ select IBM_NEW_EMAC_EMAC4
+ select IBM_NEW_EMAC_RGMII
+ select IBM_NEW_EMAC_ZMII
+ select IBM_NEW_EMAC_TAH
help
This option enables support for the AMCC PPC460EX evaluation board.
+config ARCHES
+ bool "Arches"
+ depends on 44x
+ default n
+ select 460EX
+ select IBM_NEW_EMAC_EMAC4
+ select IBM_NEW_EMAC_TAH
+ help
+ This option enables support for the AMCC PPC460GT evaluation board.
+
config YOSEMITE
bool "Yosemite"
depends on 44x
@@ -169,10 +183,6 @@ config 440SPe
config 460EX
bool
select PPC_FPU
- select IBM_NEW_EMAC_EMAC4
- select IBM_NEW_EMAC_RGMII
- select IBM_NEW_EMAC_ZMII
- select IBM_NEW_EMAC_TAH
# 44x errata/workaround config symbols, selected by the CPU models above
config IBM440EP_ERR42
diff --git a/arch/powerpc/platforms/44x/Makefile
b/arch/powerpc/platforms/44x/Makefile
index 8d0b1a1..3f83f73 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -9,5 +9,6 @@ obj-$(CONFIG_KATMAI) += katmai.o
obj-$(CONFIG_RAINIER) += rainier.o
obj-$(CONFIG_WARP) += warp.o
obj-$(CONFIG_WARP) += warp-nand.o
+obj-$(CONFIG_ARCHES) += canyonlands.o
obj-$(CONFIG_CANYONLANDS) += canyonlands.o
obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
--
1.5.5
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
