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.

Fixes: f4985a22ca1b ("kernel: Update kernel 4.14 to version 4.14.187")
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 472b8fc91bbab0530d72e9780a482bacc1bbe5f7)

diff --git a/target/linux/armvirt/config-4.14 b/target/linux/armvirt/config-4.14
index a2d8bb4f20b7b33c300927f42420bb1b9e9cfc04..b46e89b4ee3ce96dcf1cd29616779a5b23c61595 100644 (file)
--- a/target/linux/armvirt/config-4.14
+++ b/target/linux/armvirt/config-4.14
@@ -39,6 +39,7 @@ CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_DMADEVICES=y
 CONFIG_DTC=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y

diff --git a/target/linux/x86/config-4.14 b/target/linux/x86/config-4.14
index 5abec3b6ebe6a693d16bdb4deaf6122acaf45ba7..355a8cbcdc08744f0b46f76929199f35ef6a6e10 100644 (file)
--- a/target/linux/x86/config-4.14
+++ b/target/linux/x86/config-4.14
@@ -115,6 +115,7 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DELL_RBU is not set
+CONFIG_DMADEVICES=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y