From 6b6346fe1b9011e3c0c5f757af37d5bd1f3331fa Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 24 Sep 2019 16:13:00 -0600 Subject: [PATCH] UBUNTU: [Config] Enable HiSilicon QM/ZIP as modules BugLink: https://bugs.launchpad.net/bugs/1845355 Signed-off-by: dann frazier Signed-off-by: Seth Forshee --- debian.master/config/annotations | 7 +++++++ debian.master/config/config.common.ubuntu | 3 +++ 2 files changed, 10 insertions(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 093107b7ea40..8bd038956f6c 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -430,6 +430,13 @@ CONFIG_CRYPTO_DEV_SAFEXCEL policy<{'arm64': 'm'}> CONFIG_CRYPTO_DEV_ARTPEC6 policy<{'armhf': 'm'}> CONFIG_CRYPTO_DEV_CCREE policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}> CONFIG_CRYPTO_DEV_HISI_SEC policy<{'arm64': 'm'}> +CONFIG_CRYPTO_DEV_HISI_QM policy<{'arm64': 'm'}> +CONFIG_CRYPTO_DEV_HISI_QM mark +CONFIG_CRYPTO_HISI_SGL policy<{'arm64': 'm'}> +CONFIG_CRYPTO_HISI_SGL mark +CONFIG_CRYPTO_DEV_HISI_ZIP policy<{'arm64': 'm'}> +CONFIG_CRYPTO_DEV_HISI_ZIP mark + # CONFIG_ZCRYPT_MULTIDEVNODES mark note diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index eca1ff2e3cb5..4a2b79175b96 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2058,7 +2058,9 @@ CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m CONFIG_CRYPTO_DEV_GEODE=m CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +CONFIG_CRYPTO_DEV_HISI_QM=m CONFIG_CRYPTO_DEV_HISI_SEC=m +CONFIG_CRYPTO_DEV_HISI_ZIP=m CONFIG_CRYPTO_DEV_MARVELL_CESA=m CONFIG_CRYPTO_DEV_MEDIATEK=m # CONFIG_CRYPTO_DEV_MXS_DCP is not set @@ -2116,6 +2118,7 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=m CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HISI_SGL=m CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=y -- 2.39.5