Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c186dbe4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-defconfig-4.13' of... 

Merge tag 'samsung-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig ARM update for v4.13:
1. Enable Exynos PRNG along with user-space crypto API.

* tag 'samsung-defconfig-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: multi_v7_defconfig: Enable Exynos RNG and user-space crypto API
  ARM: exynos_defconfig: Enable Exynos RNG and user-space crypto API

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f9928af6 f33160d1

arch/arm/configs/exynos_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -265,6 +265,12 @@ CONFIG_DEBUG_RT_MUTEXES=y 
CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_DEV_EXYNOS_RNG=y

CONFIG_CRYPTO_DEV_S5P=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=m

arch/arm/configs/multi_v7_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -935,7 +935,13 @@ CONFIG_CPUFREQ_DT=y 
CONFIG_KEYSTONE_IRQ=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_ST=y

CONFIG_CRYPTO_USER=m

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_DEV_MARVELL_CESA=m

CONFIG_CRYPTO_DEV_EXYNOS_RNG=m

CONFIG_CRYPTO_DEV_S5P=m

CONFIG_CRYPTO_DEV_SUN4I_SS=m

CONFIG_CRYPTO_DEV_ROCKCHIP=m