diff mbox series

[1/2,F] Revert "UBUNTU: [Config] Disable hisi_sec2 temporarily"

Message ID 20200804081804.11820-1-ike.pan@canonical.com
State New
Headers show
Series Update Hisilicon SEC driver parameter | expand

Commit Message

Ike Panhc Aug. 4, 2020, 8:18 a.m. UTC
BugLink: https://launchpad.net/bugs/1890222

This reverts commit 951fbd63c04096369d8fc5ff3e53ddc2b2d5111b.

Signed-off-by: Ike Panhc <ike.pan@canonical.com>
---
 debian.master/abi/5.4.0-41.45/arm64/generic.modules | 1 +
 debian.master/config/annotations                    | 2 +-
 debian.master/config/config.common.ubuntu           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/abi/5.4.0-41.45/arm64/generic.modules b/debian.master/abi/5.4.0-41.45/arm64/generic.modules
index d6f74358a075..a41c6bc99ad9 100644
--- a/debian.master/abi/5.4.0-41.45/arm64/generic.modules
+++ b/debian.master/abi/5.4.0-41.45/arm64/generic.modules
@@ -1894,6 +1894,7 @@  hisi_sas_v1_hw
 hisi_sas_v2_hw
 hisi_sas_v3_hw
 hisi_sec
+hisi_sec2
 hisi_thermal
 hisi_zip
 hix5hd2_gmac
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 166a67bf0b51..376197c0752c 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -422,7 +422,7 @@  CONFIG_CRYPTO_DEV_SAFEXCEL                      policy<{'amd64': 'm', 'arm64': '
 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_SEC2                     policy<{'arm64': 'n'}>
+CONFIG_CRYPTO_DEV_HISI_SEC2                     policy<{'arm64': 'm'}>
 CONFIG_CRYPTO_DEV_HISI_ZIP                      policy<{'arm64': 'm'}>
 CONFIG_CRYPTO_DEV_HISI_HPRE                     policy<{'arm64': 'm'}>
 #
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bbe02bd86648..30639be13d20 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2091,7 +2091,7 @@  CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_HISI_HPRE=m
 CONFIG_CRYPTO_DEV_HISI_QM=m
 CONFIG_CRYPTO_DEV_HISI_SEC=m
-# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
+CONFIG_CRYPTO_DEV_HISI_SEC2=m
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_MEDIATEK=m