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/mediatek/mt7622/config-5.4 | 6 ------ target/linux/mediatek/mt7623/config-5.4 | 6 ------ target/linux/mediatek/mt7629/config-5.4 | 6 ------ 3 files changed, 18 deletions(-) (limited to 'target/linux/mediatek') diff --git a/target/linux/mediatek/mt7622/config-5.4 b/target/linux/mediatek/mt7622/config-5.4 index 536b0bff43..f867844885 100755 --- a/target/linux/mediatek/mt7622/config-5.4 +++ b/target/linux/mediatek/mt7622/config-5.4 @@ -1,5 +1,4 @@ CONFIG_64BIT=y -CONFIG_64BIT_TIME=y CONFIG_AHCI_MTK=y # CONFIG_ARCH_AGILEX is not set # CONFIG_ARCH_BITMAIN is not set @@ -247,7 +246,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DMADEVICES=y CONFIG_DMATEST=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_ENGINE=y CONFIG_DMA_ENGINE_RAID=y @@ -404,7 +402,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y CONFIG_JUMP_LABEL=y -CONFIG_KASAN_STACK=1 CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y @@ -463,7 +460,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PADATA=y CONFIG_PARTITION_PERCPU=y @@ -584,9 +580,7 @@ CONFIG_TIMER_PROBE=y # CONFIG_TI_CPSW_PHY_SEL is not set CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -CONFIG_UBSAN_ALIGNMENT=y # CONFIG_UCLAMP_TASK is not set -CONFIG_UNIX_SCM=y # CONFIG_UNMAP_KERNEL_AT_EL0 is not set CONFIG_USB=y CONFIG_USB_COMMON=y diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4 index 9338b1d114..6e1ff28bd3 100644 --- a/target/linux/mediatek/mt7623/config-5.4 +++ b/target/linux/mediatek/mt7623/config-5.4 @@ -1,4 +1,3 @@ -CONFIG_64BIT_TIME=y # CONFIG_AIO is not set CONFIG_ALIGNMENT_TRAP=y CONFIG_ARCH_32BIT_OFF_T=y @@ -191,7 +190,6 @@ CONFIG_DEBUG_UART_VIRT=0xf1004000 CONFIG_DEBUG_UNCOMPRESS=y # CONFIG_DEBUG_USER is not set CONFIG_DMADEVICES=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_REMAP=y @@ -323,7 +321,6 @@ CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y CONFIG_KALLSYMS=y -CONFIG_KASAN_STACK=1 CONFIG_LEDS_MT6323=y CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y @@ -415,7 +412,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_PADATA=y @@ -536,11 +532,9 @@ CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4 index d25c8331ad..861ce4222b 100644 --- a/target/linux/mediatek/mt7629/config-5.4 +++ b/target/linux/mediatek/mt7629/config-5.4 @@ -1,4 +1,3 @@ -CONFIG_64BIT_TIME=y # CONFIG_ADIN_PHY is not set CONFIG_ALIGNMENT_TRAP=y # CONFIG_AL_FIC is not set @@ -149,7 +148,6 @@ CONFIG_DEBUG_MISC=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_USER is not set CONFIG_DEFAULT_HOSTNAME="(mt7629)" -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_REMAP=y CONFIG_DTC=y CONFIG_EDAC_ATOMIC_SCRUB=y @@ -263,7 +261,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_IRQ_WORK=y -CONFIG_KASAN_STACK=1 # CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set # CONFIG_LEDS_TRIGGER_AUDIO is not set @@ -341,7 +338,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y @@ -455,10 +451,8 @@ CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" # CONFIG_UNICODE is not set -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y -- cgit v1.2.3