diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-03-16 20:30:36 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-16 20:30:36 -0400 |
commit | da62e71d13ad0b76011491e36cb58999c464516a (patch) | |
tree | 68ef5f8f6d49352780773f862427a31fad791324 /arch/sh/drivers | |
parent | 988f831df398ff36f67b095245060c24c354e9e9 (diff) |
sh: dma: Make PVR2 DMA configurable.
With arch/sh/drivers/dma/ always being built, the Dreamcast DMA engines
are being unconditionally built in, regardless of whether the DMA API is
enabled or not. This is a regression from previous behaviour, but there
is not much advantage in building them all in unconditionally regardless.
Add a new config option to make it optional, and update the only user of
it to reflect that.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r-- | arch/sh/drivers/dma/Kconfig | 13 | ||||
-rw-r--r-- | arch/sh/drivers/dma/Makefile | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig index 32bb8fa605c2..ae26610837b2 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/arch/sh/drivers/dma/Kconfig | |||
@@ -54,4 +54,17 @@ config SH_DMABRG | |||
54 | of the SH7760. | 54 | of the SH7760. |
55 | Say Y if you want to use Audio/USB DMA on your SH7760 board. | 55 | Say Y if you want to use Audio/USB DMA on your SH7760 board. |
56 | 56 | ||
57 | config PVR2_DMA | ||
58 | tristate "PowerVR 2 DMAC support" | ||
59 | depends on SH_DREAMCAST && SH_DMA | ||
60 | help | ||
61 | Selecting this will enable support for the PVR2 DMA controller. | ||
62 | As this chains off of the on-chip DMAC, that must also be | ||
63 | enabled by default. | ||
64 | |||
65 | This is primarily used by the pvr2fb framebuffer driver for | ||
66 | certain optimizations, but is not necessary for functionality. | ||
67 | |||
68 | If in doubt, say N. | ||
69 | |||
57 | endmenu | 70 | endmenu |
diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile index ab956adacb47..cff52cb6ac71 100644 --- a/arch/sh/drivers/dma/Makefile +++ b/arch/sh/drivers/dma/Makefile | |||
@@ -4,5 +4,6 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_SH_DMA_API) += dma-api.o dma-sysfs.o | 5 | obj-$(CONFIG_SH_DMA_API) += dma-api.o dma-sysfs.o |
6 | obj-$(CONFIG_SH_DMA) += dma-sh.o | 6 | obj-$(CONFIG_SH_DMA) += dma-sh.o |
7 | obj-$(CONFIG_SH_DREAMCAST) += dma-pvr2.o dma-g2.o | 7 | obj-$(CONFIG_SH_DREAMCAST) += dma-g2.o |
8 | obj-$(CONFIG_PVR2_DMA) += dma-pvr2.o | ||
8 | obj-$(CONFIG_SH_DMABRG) += dmabrg.o | 9 | obj-$(CONFIG_SH_DMABRG) += dmabrg.o |