diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-10-18 15:52:46 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-10-18 15:52:46 +0000 |
| commit | 3290018e72cdf6a1b90e672710ad2a6dda9fffd6 (patch) | |
| tree | 2659671426442a8b64580044bfdf95540601269a | |
| parent | fc5ee7e694008e5c721e4124293d96e2bf6e0d59 (diff) | |
| parent | 77b481edb44f0e93ec9f496ca055789f3d5c616e (diff) | |
Merge remote-tracking branch 'sa8155p-adp-defconfig/tracking-qcomlt-sa8155p-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20211020-044822-v5.15-rc6-236-g3290018e72cdf
| -rw-r--r-- | arch/arm64/configs/defconfig | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ce8f99a0fbd8..b70340a51c92 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -602,6 +602,7 @@ CONFIG_TEGRA_SOCTHERM=m CONFIG_QCOM_TSENS=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 @@ -1211,7 +1212,7 @@ CONFIG_INTERCONNECT_QCOM_OSM_L3=m CONFIG_INTERCONNECT_QCOM_QCS404=m CONFIG_INTERCONNECT_QCOM_SC7180=m CONFIG_INTERCONNECT_QCOM_SDM845=y -CONFIG_INTERCONNECT_QCOM_SM8150=m +CONFIG_INTERCONNECT_QCOM_SM8150=y CONFIG_INTERCONNECT_QCOM_SM8250=m CONFIG_INTERCONNECT_QCOM_SM8350=m CONFIG_EXT2_FS=y @@ -1246,11 +1247,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 |