diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-15 10:45:03 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-15 10:45:03 +1100 |
| commit | 6a1c9dfe4186f18fed38421b35b40fb9260cbfe1 (patch) | |
| tree | c779921e8a5c77ee190532df9463e533a2152ba0 /arch/powerpc/platforms | |
| parent | powerpc/watchdog: Make default timeout for Book-E watchdog a Kconfig option (diff) | |
| parent | powerpc/44x: Update ppc44x_defconfig (diff) | |
| download | linux-dev-6a1c9dfe4186f18fed38421b35b40fb9260cbfe1.tar.xz linux-dev-6a1c9dfe4186f18fed38421b35b40fb9260cbfe1.zip | |
Merge remote branch 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 16 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/ppc44x_simple.c | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 69d668c072ae..0f979c5c756b 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -17,6 +17,16 @@ config BAMBOO help This option enables support for the IBM PPC440EP evaluation board. +config BLUESTONE + bool "Bluestone" + depends on 44x + default n + select PPC44x_SIMPLE + select APM821xx + select IBM_NEW_EMAC_RGMII + help + This option enables support for the APM APM821xx Evaluation board. + config EBONY bool "Ebony" depends on 44x @@ -293,6 +303,12 @@ config 460SX select IBM_NEW_EMAC_ZMII select IBM_NEW_EMAC_TAH +config APM821xx + bool + select PPC_FPU + select IBM_NEW_EMAC_EMAC4 + select IBM_NEW_EMAC_TAH + # 44x errata/workaround config symbols, selected by the CPU models above config IBM440EP_ERR42 bool diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c index 5f7a29d7f590..7ddcba3b9397 100644 --- a/arch/powerpc/platforms/44x/ppc44x_simple.c +++ b/arch/powerpc/platforms/44x/ppc44x_simple.c @@ -52,6 +52,7 @@ machine_device_initcall(ppc44x_simple, ppc44x_device_probe); static char *board[] __initdata = { "amcc,arches", "amcc,bamboo", + "amcc,bluestone", "amcc,canyonlands", "amcc,glacier", "ibm,ebony", |