diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-12-19 20:38:18 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-12-19 20:38:18 +0100 |
| commit | b38b08eba2ab8d5d61f5eb2447ceba652f912729 (patch) | |
| tree | 682f08158532168f2e3a26b79bcae4204ae34cf2 /arch | |
| parent | 53e80e11dacd5a901790ae7ea1f0d164773f707e (diff) | |
defconfig: regen
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/m2note_defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm64/configs/m2note_defconfig b/arch/arm64/configs/m2note_defconfig index f9ca7306e..3ca8f9eb4 100644 --- a/arch/arm64/configs/m2note_defconfig +++ b/arch/arm64/configs/m2note_defconfig @@ -179,7 +179,6 @@ CONFIG_HAVE_DMA_ATTRS=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_HAVE_CLK=y -# CONFIG_HAVE_DMA_API_DEBUG is not set CONFIG_HAVE_HW_BREAKPOINT=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y @@ -912,6 +911,7 @@ CONFIG_UEVENT_HELPER_PATH="" CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y +# CONFIG_FW_CACHE is not set CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_LOADER_USER_HELPER=y @@ -3166,7 +3166,6 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y @@ -3266,8 +3265,6 @@ CONFIG_CRYPTO_HMAC=y # # Digest # -CONFIG_CRYPTO_CHACHA20=y -CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_CRC32=y # CONFIG_CRYPTO_GHASH is not set @@ -3300,6 +3297,8 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set +CONFIG_CRYPTO_CHACHA20=y +CONFIG_CRYPTO_CHACHA20_NEON=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set |