summaryrefslogtreecommitdiffstats
path: root/arch/unicore32
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-04-24 09:00:54 +0200
committerChristoph Hellwig <hch@lst.de>2018-05-09 06:58:01 +0200
commit09230cbc1baba68e0ca1e7c489344ce5d35c6f27 (patch)
treed125ba685e491df0cfb05660e30ece8a84a10643 /arch/unicore32
parent8d9b409b1a42db9986dfe2d510fe7aea7a98a203 (diff)
downloadop-kernel-dev-09230cbc1baba68e0ca1e7c489344ce5d35c6f27.zip
op-kernel-dev-09230cbc1baba68e0ca1e7c489344ce5d35c6f27.tar.gz
swiotlb: move the SWIOTLB config symbol to lib/Kconfig
This way we have one central definition of it, and user can select it as needed. The new option is not user visible, which is the behavior it had in most architectures, with a few notable exceptions: - On x86_64 and mips/loongson3 it used to be user selectable, but defaulted to y. It now is unconditional, which seems like the right thing for 64-bit architectures without guaranteed availablity of IOMMUs. - on powerpc the symbol is user selectable and defaults to n, but many boards select it. This change assumes no working setup required a manual selection, but if that turned out to be wrong we'll have to add another select statement or two for the respective boards. Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'arch/unicore32')
-rw-r--r--arch/unicore32/Kconfig1
-rw-r--r--arch/unicore32/mm/Kconfig4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 8219571..03f991e 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -20,6 +20,7 @@ config UNICORE32
select GENERIC_IOMAP
select MODULES_USE_ELF_REL
select NEED_DMA_MAP_STATE
+ select SWIOTLB
help
UniCore-32 is 32-bit Instruction Set Architecture,
including a series of low-power-consumption RISC chip
diff --git a/arch/unicore32/mm/Kconfig b/arch/unicore32/mm/Kconfig
index 45b7f76..82759b6 100644
--- a/arch/unicore32/mm/Kconfig
+++ b/arch/unicore32/mm/Kconfig
@@ -39,7 +39,3 @@ config CPU_TLB_SINGLE_ENTRY_DISABLE
default y
help
Say Y here to disable the TLB single entry operations.
-
-config SWIOTLB
- def_bool y
- select DMA_DIRECT_OPS
OpenPOWER on IntegriCloud