diff options
| author | Olof Johansson <olof@lixom.net> | 2019-11-03 17:08:25 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-11-03 17:08:26 -0800 |
| commit | fcdc4372243672ab06725102f83c7bb8d288b797 (patch) | |
| tree | 7a262a60b9d8adc9a79299d5da5deca5ba6a4220 /arch | |
| parent | 5003119e43f0b5683978abeb2d24205a97a3a6be (diff) | |
| parent | 2fabf6dd77014f19d45fc71c01f1b073c03df255 (diff) | |
| download | linux-stable-fcdc4372243672ab06725102f83c7bb8d288b797.tar.gz linux-stable-fcdc4372243672ab06725102f83c7bb8d288b797.tar.bz2 linux-stable-fcdc4372243672ab06725102f83c7bb8d288b797.zip | |
Merge tag 'sunxi-config64-for-5.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
One new patch to the arm64 defconfig to enable the new crypto engine
driver.
* tag 'sunxi-config64-for-5.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: defconfig: add new Allwinner crypto options
Link: https://lore.kernel.org/r/539241d6-9b2e-4d5b-bd63-f912cf6ebf96.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index be192baf1c56..7d16f10a9251 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -116,6 +116,8 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_CHACHA20_NEON=m CONFIG_CRYPTO_AES_ARM64_BS=m +CONFIG_CRYPTO_DEV_ALLWINNER=y +CONFIG_CRYPTO_DEV_SUN8I_CE=m CONFIG_JUMP_LABEL=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y |