From 1deadfe3de452ce633317862079537a1c9db3013 Mon Sep 17 00:00:00 2001 From: Sergey Ryazanov Date: Mon, 21 May 2018 12:12:33 +0300 Subject: [PATCH] kernel: disable DMA_{NOOP|VIRT}_OPS by default These options do not used by any supported arch, so disable them by default to make arch configs a bit more clean. Signed-off-by: Sergey Ryazanov (cherry picked from commit ead26e9db649a508ba93e7e8193ada70322620b1) --- target/linux/apm821xx/config-4.14 | 2 -- target/linux/archs38/config-4.14 | 2 -- target/linux/ath79/config-4.14 | 2 -- target/linux/bcm53xx/config-4.14 | 2 -- target/linux/brcm47xx/config-4.14 | 2 -- target/linux/brcm63xx/config-4.14 | 2 -- target/linux/cns3xxx/config-4.14 | 2 -- target/linux/gemini/config-4.14 | 2 -- target/linux/generic/config-4.14 | 2 ++ target/linux/imx6/config-4.14 | 2 -- target/linux/ipq40xx/config-4.14 | 2 -- target/linux/kirkwood/config-4.14 | 2 -- target/linux/lantiq/config-4.14 | 2 -- target/linux/mediatek/config-4.14 | 2 -- target/linux/mvebu/config-4.14 | 2 -- target/linux/mxs/config-4.14 | 2 -- target/linux/octeon/config-4.14 | 2 -- target/linux/octeontx/config-4.14 | 2 -- target/linux/pistachio/config-4.14 | 2 -- target/linux/ramips/mt7620/config-4.14 | 2 -- target/linux/ramips/mt76x8/config-4.14 | 2 -- target/linux/ramips/rt288x/config-4.14 | 2 -- target/linux/ramips/rt3883/config-4.14 | 2 -- target/linux/sunxi/config-4.14 | 2 -- target/linux/x86/config-4.14 | 2 -- 25 files changed, 2 insertions(+), 48 deletions(-) diff --git a/target/linux/apm821xx/config-4.14 b/target/linux/apm821xx/config-4.14 index 9ace3ebf4c..2b8dc45c3d 100644 --- a/target/linux/apm821xx/config-4.14 +++ b/target/linux/apm821xx/config-4.14 @@ -90,8 +90,6 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_DECOMPRESS_GZIP=y # CONFIG_DEFAULT_UIMAGE is not set -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y # CONFIG_E200 is not set diff --git a/target/linux/archs38/config-4.14 b/target/linux/archs38/config-4.14 index db5c6f19e5..f7d9351855 100644 --- a/target/linux/archs38/config-4.14 +++ b/target/linux/archs38/config-4.14 @@ -61,8 +61,6 @@ CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_DWMAC_ANARION=y diff --git a/target/linux/ath79/config-4.14 b/target/linux/ath79/config-4.14 index 857c2109ef..c78c52c0c5 100644 --- a/target/linux/ath79/config-4.14 +++ b/target/linux/ath79/config-4.14 @@ -54,8 +54,6 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y diff --git a/target/linux/bcm53xx/config-4.14 b/target/linux/bcm53xx/config-4.14 index 954a32d2af..b0417df9e9 100644 --- a/target/linux/bcm53xx/config-4.14 +++ b/target/linux/bcm53xx/config-4.14 @@ -127,8 +127,6 @@ CONFIG_DEBUG_UART_PHYS=0x18000300 CONFIG_DEBUG_UART_VIRT=0xf1000300 CONFIG_DEBUG_UNCOMPRESS=y CONFIG_DEBUG_USER=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y diff --git a/target/linux/brcm47xx/config-4.14 b/target/linux/brcm47xx/config-4.14 index 3f35ca5165..190608f4ea 100644 --- a/target/linux/brcm47xx/config-4.14 +++ b/target/linux/brcm47xx/config-4.14 @@ -66,8 +66,6 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set # CONFIG_EARLY_PRINTK is not set CONFIG_EXPORTFS=y diff --git a/target/linux/brcm63xx/config-4.14 b/target/linux/brcm63xx/config-4.14 index c6cca7a51f..d306a98dc5 100644 --- a/target/linux/brcm63xx/config-4.14 +++ b/target/linux/brcm63xx/config-4.14 @@ -74,8 +74,6 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14 index 29ac65eab5..16f32c1037 100644 --- a/target/linux/cns3xxx/config-4.14 +++ b/target/linux/cns3xxx/config-4.14 @@ -93,8 +93,6 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_USER is not set CONFIG_DMA_CACHE_FIQ_BROADCAST=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y diff --git a/target/linux/gemini/config-4.14 b/target/linux/gemini/config-4.14 index cf19442192..0255a85309 100644 --- a/target/linux/gemini/config-4.14 +++ b/target/linux/gemini/config-4.14 @@ -135,11 +135,9 @@ CONFIG_DMADEVICES=y CONFIG_DMATEST=y CONFIG_DMA_ENGINE=y CONFIG_DMA_ENGINE_RAID=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DMA_VIRTUAL_CHANNELS=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_DUMMY_CONSOLE=y diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index 5308155637..9fa4bbd1f3 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -1117,7 +1117,9 @@ CONFIG_DEVPORT=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_ENGINE is not set # CONFIG_DMA_FENCE_TRACE is not set +# CONFIG_DMA_NOOP_OPS is not set # CONFIG_DMA_SHARED_BUFFER is not set +# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DM_CACHE is not set # CONFIG_DM_DEBUG is not set # CONFIG_DM_DELAY is not set diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14 index 0877d7d450..bf920f8f7b 100644 --- a/target/linux/imx6/config-4.14 +++ b/target/linux/imx6/config-4.14 @@ -166,9 +166,7 @@ CONFIG_DECOMPRESS_LZO=y CONFIG_DECOMPRESS_XZ=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_E1000E=y diff --git a/target/linux/ipq40xx/config-4.14 b/target/linux/ipq40xx/config-4.14 index 643ce094ca..5a5f4a4610 100644 --- a/target/linux/ipq40xx/config-4.14 +++ b/target/linux/ipq40xx/config-4.14 @@ -147,11 +147,9 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DMA_VIRTUAL_CHANNELS=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_DT_IDLE_STATES=y diff --git a/target/linux/kirkwood/config-4.14 b/target/linux/kirkwood/config-4.14 index f16c6bd47b..b9523b1643 100644 --- a/target/linux/kirkwood/config-4.14 +++ b/target/linux/kirkwood/config-4.14 @@ -102,8 +102,6 @@ CONFIG_DEBUG_UART_VIRT=0xfed12000 CONFIG_DEBUG_UNCOMPRESS=y # CONFIG_DEBUG_USER is not set # CONFIG_DLCI is not set -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set CONFIG_DNOTIFY=y # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y diff --git a/target/linux/lantiq/config-4.14 b/target/linux/lantiq/config-4.14 index 04be66b2b2..4b2ab7da46 100644 --- a/target/linux/lantiq/config-4.14 +++ b/target/linux/lantiq/config-4.14 @@ -46,8 +46,6 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y # CONFIG_DT_EASY50712 is not set diff --git a/target/linux/mediatek/config-4.14 b/target/linux/mediatek/config-4.14 index b331312eb4..6712c2029c 100644 --- a/target/linux/mediatek/config-4.14 +++ b/target/linux/mediatek/config-4.14 @@ -159,9 +159,7 @@ CONFIG_DEBUG_UNCOMPRESS=y # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y diff --git a/target/linux/mvebu/config-4.14 b/target/linux/mvebu/config-4.14 index 572e4fd856..3afa40b514 100644 --- a/target/linux/mvebu/config-4.14 +++ b/target/linux/mvebu/config-4.14 @@ -164,9 +164,7 @@ CONFIG_DEBUG_USER=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_ENGINE_RAID=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y diff --git a/target/linux/mxs/config-4.14 b/target/linux/mxs/config-4.14 index 84c42b6ad8..7dce681bd5 100644 --- a/target/linux/mxs/config-4.14 +++ b/target/linux/mxs/config-4.14 @@ -88,9 +88,7 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y diff --git a/target/linux/octeon/config-4.14 b/target/linux/octeon/config-4.14 index 4a928cff58..37410d683d 100644 --- a/target/linux/octeon/config-4.14 +++ b/target/linux/octeon/config-4.14 @@ -89,8 +89,6 @@ CONFIG_DEBUG_SPINLOCK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 CONFIG_DETECT_HUNG_TASK=y CONFIG_DMA_COHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set CONFIG_DNOTIFY=y # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y diff --git a/target/linux/octeontx/config-4.14 b/target/linux/octeontx/config-4.14 index e27b68c30b..ef1a5bec50 100644 --- a/target/linux/octeontx/config-4.14 +++ b/target/linux/octeontx/config-4.14 @@ -188,10 +188,8 @@ CONFIG_DEFAULT_NOOP=y CONFIG_DMADEVICES=y CONFIG_DMA_CMA=y CONFIG_DMA_ENGINE=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y CONFIG_DT_IDLE_STATES=y diff --git a/target/linux/pistachio/config-4.14 b/target/linux/pistachio/config-4.14 index 87c14fc1e4..ec8ad08cac 100644 --- a/target/linux/pistachio/config-4.14 +++ b/target/linux/pistachio/config-4.14 @@ -79,10 +79,8 @@ CONFIG_CSRC_R4K=y CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y CONFIG_DMA_VIRTUAL_CHANNELS=y -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y # CONFIG_DWMAC_DWC_QOS_ETH is not set diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14 index adb6078edf..f8bc622323 100644 --- a/target/linux/ramips/mt7620/config-4.14 +++ b/target/linux/ramips/mt7620/config-4.14 @@ -53,8 +53,6 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DEBUG_PINCTRL=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set # CONFIG_DTB_MT7620A_EVAL is not set # CONFIG_DTB_OMEGA2P is not set diff --git a/target/linux/ramips/mt76x8/config-4.14 b/target/linux/ramips/mt76x8/config-4.14 index e83b10c35d..f1d44710dd 100644 --- a/target/linux/ramips/mt76x8/config-4.14 +++ b/target/linux/ramips/mt76x8/config-4.14 @@ -53,8 +53,6 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DEBUG_PINCTRL=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set # CONFIG_DTB_MT7620A_EVAL is not set # CONFIG_DTB_OMEGA2P is not set diff --git a/target/linux/ramips/rt288x/config-4.14 b/target/linux/ramips/rt288x/config-4.14 index 4a73b0c79a..d43b65500d 100644 --- a/target/linux/ramips/rt288x/config-4.14 +++ b/target/linux/ramips/rt288x/config-4.14 @@ -49,8 +49,6 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set # CONFIG_DTB_RT2880_EVAL is not set CONFIG_DTB_RT_NONE=y diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14 index 8e25057a67..a787213632 100644 --- a/target/linux/ramips/rt3883/config-4.14 +++ b/target/linux/ramips/rt3883/config-4.14 @@ -51,8 +51,6 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DEBUG_PINCTRL=y CONFIG_DMA_NONCOHERENT=y -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set # CONFIG_DRM_LIB_RANDOM is not set # CONFIG_DTB_RT3883_EVAL is not set CONFIG_DTB_RT_NONE=y diff --git a/target/linux/sunxi/config-4.14 b/target/linux/sunxi/config-4.14 index de3be917ca..de38c4e17c 100644 --- a/target/linux/sunxi/config-4.14 +++ b/target/linux/sunxi/config-4.14 @@ -146,12 +146,10 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -# CONFIG_DMA_NOOP_OPS is not set CONFIG_DMA_OF=y CONFIG_DMA_SUN4I=y CONFIG_DMA_SUN6I=y CONFIG_DMA_VIRTUAL_CHANNELS=y -# CONFIG_DMA_VIRT_OPS is not set CONFIG_DNOTIFY=y # CONFIG_DRM_LIB_RANDOM is not set CONFIG_DTC=y diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14 index 459af435bd..34ed4feaed 100644 --- a/target/linux/x86/config-4.14 +++ b/target/linux/x86/config-4.14 @@ -117,8 +117,6 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set -# CONFIG_DMA_NOOP_OPS is not set -# CONFIG_DMA_VIRT_OPS is not set CONFIG_DMI=y CONFIG_DMIID=y CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y -- 2.30.2