diff options
author | Martyn Welch <martyn.welch@ge.com> | 2012-03-12 13:12:57 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2012-03-16 12:08:05 -0400 |
commit | 330bbf485447c0cf127750eb7d68d43a73f59356 (patch) | |
tree | cbff962746b0e2e4181c3899f9b2a0255b5ca34e /arch/powerpc | |
parent | 950740098c6745d69056b3acb5090ca9d8aa918c (diff) |
powerpc: Add GE FPGA config option
This patch adds the GE_FPGA configuration option. This is being carried
out as ground work to allow the PIC and GPIO drivers to be move from the
powerpc 86xx platform directory to more general locations to allow them to
be used on non-86xx boards and to reduce churn when further boards using
these drivers are added.
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 7 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/Makefile | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 8d6599d54ea6..abe2c4fff811 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig | |||
@@ -39,6 +39,7 @@ config GEF_PPC9A | |||
39 | select MMIO_NVRAM | 39 | select MMIO_NVRAM |
40 | select GENERIC_GPIO | 40 | select GENERIC_GPIO |
41 | select ARCH_REQUIRE_GPIOLIB | 41 | select ARCH_REQUIRE_GPIOLIB |
42 | select GE_FPGA | ||
42 | help | 43 | help |
43 | This option enables support for the GE PPC9A. | 44 | This option enables support for the GE PPC9A. |
44 | 45 | ||
@@ -48,6 +49,7 @@ config GEF_SBC310 | |||
48 | select MMIO_NVRAM | 49 | select MMIO_NVRAM |
49 | select GENERIC_GPIO | 50 | select GENERIC_GPIO |
50 | select ARCH_REQUIRE_GPIOLIB | 51 | select ARCH_REQUIRE_GPIOLIB |
52 | select GE_FPGA | ||
51 | help | 53 | help |
52 | This option enables support for the GE SBC310. | 54 | This option enables support for the GE SBC310. |
53 | 55 | ||
@@ -57,10 +59,15 @@ config GEF_SBC610 | |||
57 | select MMIO_NVRAM | 59 | select MMIO_NVRAM |
58 | select GENERIC_GPIO | 60 | select GENERIC_GPIO |
59 | select ARCH_REQUIRE_GPIOLIB | 61 | select ARCH_REQUIRE_GPIOLIB |
62 | select GE_FPGA | ||
60 | select HAS_RAPIDIO | 63 | select HAS_RAPIDIO |
61 | help | 64 | help |
62 | This option enables support for the GE SBC610. | 65 | This option enables support for the GE SBC610. |
63 | 66 | ||
67 | config GE_FPGA | ||
68 | bool | ||
69 | default n | ||
70 | |||
64 | endif | 71 | endif |
65 | 72 | ||
66 | config MPC8641 | 73 | config MPC8641 |
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile index 4b0d7b1aa005..ac6a50fdd1d1 100644 --- a/arch/powerpc/platforms/86xx/Makefile +++ b/arch/powerpc/platforms/86xx/Makefile | |||
@@ -8,6 +8,7 @@ obj-$(CONFIG_MPC8641_HPCN) += mpc86xx_hpcn.o | |||
8 | obj-$(CONFIG_SBC8641D) += sbc8641d.o | 8 | obj-$(CONFIG_SBC8641D) += sbc8641d.o |
9 | obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o | 9 | obj-$(CONFIG_MPC8610_HPCD) += mpc8610_hpcd.o |
10 | gef-gpio-$(CONFIG_GPIOLIB) += gef_gpio.o | 10 | gef-gpio-$(CONFIG_GPIOLIB) += gef_gpio.o |
11 | obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o gef_pic.o $(gef-gpio-y) | 11 | obj-$(CONFIG_GE_FPGA) += gef_pic.o $(gef-gpio-y) |
12 | obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o gef_pic.o $(gef-gpio-y) | 12 | obj-$(CONFIG_GEF_SBC610) += gef_sbc610.o |
13 | obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o gef_pic.o $(gef-gpio-y) | 13 | obj-$(CONFIG_GEF_SBC310) += gef_sbc310.o |
14 | obj-$(CONFIG_GEF_PPC9A) += gef_ppc9a.o | ||