From 860652f4b9da40c80ae96d55778a3cd887514e3d Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 3 Mar 2020 23:28:18 +0800 Subject: kernel: 5.4: move some kconfig options to generic CONFIG_64BIT_TIME=y CONFIG_KASAN_STACK=1 CONFIG_UBSAN_ALIGNMENT=y CONFIG_UNIX_SCM=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_OF_RESERVED_MEM=y Signed-off-by: Yousong Zhou --- target/linux/generic/config-5.4 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/config-5.4') diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index fc3e157e9b..07eb95de8c 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -1,5 +1,6 @@ # CONFIG_104_QUAD_8 is not set CONFIG_32BIT=y +CONFIG_64BIT_TIME=y # CONFIG_6LOWPAN is not set # CONFIG_6LOWPAN_DEBUGFS is not set # CONFIG_6PACK is not set @@ -971,13 +972,13 @@ CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_CCM is not set # CONFIG_CRYPTO_CFB is not set # CONFIG_CRYPTO_CHACHA20 is not set -# CONFIG_CRYPTO_CHACHA20_NEON is not set # CONFIG_CRYPTO_CHACHA20POLY1305 is not set +# CONFIG_CRYPTO_CHACHA20_NEON is not set # CONFIG_CRYPTO_CMAC is not set # CONFIG_CRYPTO_CRC32 is not set -# CONFIG_CRYPTO_CRC32_ARM_CE is not set # CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CRC32C_INTEL is not set +# CONFIG_CRYPTO_CRC32_ARM_CE is not set # CONFIG_CRYPTO_CRCT10DIF is not set # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_CTR is not set @@ -1080,9 +1081,9 @@ CONFIG_CRYPTO_PCRYPT=y # CONFIG_CRYPTO_SHA1_ARM is not set # CONFIG_CRYPTO_SHA1_ARM_CE is not set # CONFIG_CRYPTO_SHA1_ARM_NEON is not set -# CONFIG_CRYPTO_SHA2_ARM_CE is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA256_ARM is not set +# CONFIG_CRYPTO_SHA2_ARM_CE is not set # CONFIG_CRYPTO_SHA3 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_SHA512_ARM is not set @@ -1242,6 +1243,7 @@ CONFIG_DEVPORT=y # CONFIG_DMASCC is not set # CONFIG_DMATEST is not set # CONFIG_DMA_API_DEBUG is not set +CONFIG_DMA_DECLARE_COHERENT=y # CONFIG_DMA_ENGINE is not set # CONFIG_DMA_FENCE_TRACE is not set # CONFIG_DMA_JZ4780 is not set @@ -2493,6 +2495,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y # CONFIG_KALLSYMS_UNCOMPRESSED is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_KASAN is not set +CONFIG_KASAN_STACK=1 # CONFIG_KCOV is not set # CONFIG_KERNEL_BZIP2 is not set # CONFIG_KERNEL_CAT is not set @@ -3752,6 +3755,7 @@ CONFIG_NMI_LOG_BUF_SHIFT=13 # CONFIG_OBS600 is not set # CONFIG_OCFS2_FS is not set # CONFIG_OF_OVERLAY is not set +CONFIG_OF_RESERVED_MEM=y # CONFIG_OF_UNITTEST is not set # CONFIG_OMAP2_DSS_DEBUG is not set # CONFIG_OMAP2_DSS_DEBUGFS is not set @@ -5736,6 +5740,7 @@ CONFIG_UBIFS_FS_FORMAT4=y # CONFIG_UBIFS_FS_SECURITY is not set # CONFIG_UBIFS_FS_XATTR is not set # CONFIG_UBSAN is not set +CONFIG_UBSAN_ALIGNMENT=y # CONFIG_UCB1400_CORE is not set # CONFIG_UCSI is not set # CONFIG_UDF_FS is not set @@ -5755,6 +5760,7 @@ CONFIG_UNIX=y CONFIG_UNIX98_PTYS=y # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_UNIX_DIAG is not set +CONFIG_UNIX_SCM=y # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_UPROBES is not set # CONFIG_UPROBE_EVENTS is not set -- cgit v1.2.3