aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-06-23 09:24:57 +0200
committerPetr Štetiar <ynezz@true.cz>2020-06-23 09:29:00 +0200
commit472b8fc91bbab0530d72e9780a482bacc1bbe5f7 (patch)
treea0b5b118e29ef3216e941b9d79af2fb60a634fdf
parent3f27a6e6402ba52032def578f0944287154a490d (diff)
downloadupstream-472b8fc91bbab0530d72e9780a482bacc1bbe5f7.tar.gz
upstream-472b8fc91bbab0530d72e9780a482bacc1bbe5f7.tar.bz2
upstream-472b8fc91bbab0530d72e9780a482bacc1bbe5f7.zip
armvirt,x86: fix build breakage of crypto ccp module
Upstream in commit f9f8f0c24203 ("crypto: ccp -- don't "select" CONFIG_DMADEVICES") removed dependency on CONFIG_DMADEVICES symbol which leads to build breakage of ccp crypto module, so fix this by adding that symbol back in the kernel config. Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--target/linux/armvirt/config-5.41
-rw-r--r--target/linux/x86/config-5.41
2 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4
index 5d62dcd276..0754831fe4 100644
--- a/target/linux/armvirt/config-5.4
+++ b/target/linux/armvirt/config-5.4
@@ -63,6 +63,7 @@ CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_WORKQUEUE=y
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DMADEVICES=y
CONFIG_DMA_REMAP=y
CONFIG_DTC=y
CONFIG_EDAC_SUPPORT=y
diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4
index d847960ec0..dbd23ce0f4 100644
--- a/target/linux/x86/config-5.4
+++ b/target/linux/x86/config-5.4
@@ -123,6 +123,7 @@ CONFIG_DEBUG_MISC=y
CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_GZIP=y
# CONFIG_DELL_RBU is not set
+CONFIG_DMADEVICES=y
CONFIG_DMI=y
CONFIG_DMIID=y
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y