diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-10-31 16:30:26 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-10-31 16:30:26 +0000 |
| commit | eae2f6578b59dbccd7d16186db0460a97556f446 (patch) | |
| tree | 1d26c609a72b90258d8dd7c54df9dcfc135a42f7 | |
| parent | 4cd3b031ded1b49c98223f566ce42b7c7a632948 (diff) | |
| parent | 77b481edb44f0e93ec9f496ca055789f3d5c616e (diff) | |
Merge remote-tracking branch 'sa8155p-adp-defconfig/tracking-qcomlt-sa8155p-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20211031-211534-v5.15-rc7-253-geae2f6578b59db
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 8003be2b4f63..9c1c8d12bebc 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -602,6 +602,7 @@ CONFIG_QCOM_TSENS=y CONFIG_QCOM_LMH=y CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_SPMI_ADC_TM5=m +CONFIG_QCOM_LMH=m CONFIG_UNIPHIER_THERMAL=y CONFIG_WATCHDOG=y CONFIG_SL28CPLD_WATCHDOG=m @@ -1251,11 +1252,15 @@ CONFIG_SECURITY=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_HASH=y +CONFIG_CRYPTO_USER_API_SKCIPHER=y +CONFIG_CRYPTO_USER_API_RNG=y +CONFIG_CRYPTO_USER_API_AEAD=y CONFIG_CRYPTO_DEV_SUN8I_CE=m CONFIG_CRYPTO_DEV_FSL_CAAM=m CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=m -CONFIG_CRYPTO_DEV_QCOM_RNG=m +CONFIG_CRYPTO_DEV_QCE=y +CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_CRYPTO_DEV_CCREE=m CONFIG_CRYPTO_DEV_HISI_SEC2=m CONFIG_CRYPTO_DEV_HISI_ZIP=m |