summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-05-10 00:06:44 +0300
committerArnd Bergmann <arnd@arndb.de>2022-05-10 00:06:45 +0300
commita2e8bbe07276d8d981d0a88db9c77944877706cf (patch)
treef73cab4c15ff61a11963bc8e5d4b8fc757433724 /arch/arm
parent0e33a258413e515702fa42081a728da336cb145a (diff)
parent889b94dbc5539c8c45131aeead6d5923508f535b (diff)
downloadlinux-a2e8bbe07276d8d981d0a88db9c77944877706cf.tar.xz
Merge tag 'qcom-defconfig-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM defconfig updates for v5.19 This enables the Qualcomm random number generator and hardware crypto drivers, as well as DebugFS support, in the qcom defconfig. * tag 'qcom-defconfig-for-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: qcom_defconfig: enable debug fs support ARM: qcom_defconfig: enable options for Qualcomm random number generator Link: https://lore.kernel.org/r/20220509182209.317208-1-bjorn.andersson@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/qcom_defconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index 9981566f2096..5cd935ee148a 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -295,12 +295,20 @@ CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_ASCII=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_UTF8=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_PRINTK_TIME=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_DEBUG_INFO=y
CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
CONFIG_WATCHDOG=y
CONFIG_QCOM_WDT=y