diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-12-21 19:22:26 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-12-21 19:22:26 +0300 |
| commit | 284af7a647990ee2b82b47fa1094e38f01450ff2 (patch) | |
| tree | 68f5abc13640b5804477b77846f00f4b4dab18d9 | |
| parent | 4e34e2702d3f454593b5fd26e3c011cc5cb89106 (diff) | |
| parent | 2b1f0fa116595cab831deffc2ba3f0fe9a9840a3 (diff) | |
| download | linux-284af7a647990ee2b82b47fa1094e38f01450ff2.tar.xz | |
Merge tag 'omap-for-v4.15/defconfig-v2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
Pull "One old minor pull request pending" from Tony Lindgren:
Few omap2plus_defconfig changes for v4.15 merge window to enable NEON
based crypto and droid 4 USB PHY.
* tag 'omap-for-v4.15/defconfig-v2-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: omap2plus_defconfig: Enable droid 4 USB PHY
ARM: omap2plus_defconfig: enable NEON based crypto
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 7b97200c1d64..20f3a6963fc7 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -468,6 +468,7 @@ CONFIG_PWM_TIECAP=m CONFIG_PWM_TIEHRPWM=m CONFIG_PWM_TWL=m CONFIG_PWM_TWL_LED=m +CONFIG_PHY_CPCAP_USB=m CONFIG_PHY_DM816X_USB=m CONFIG_OMAP_USB2=m CONFIG_TI_PIPE3=y @@ -516,3 +517,13 @@ CONFIG_LIBCRC32C=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_SHA256_ARM=m +CONFIG_CRYPTO_SHA512_ARM=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_CRYPTO_AES_ARM_BS=m +CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_GHASH_ARM_CE=m |