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/bcm27xx/bcm2708/config-5.4 | 6 ------ target/linux/bcm27xx/bcm2709/config-5.4 | 6 ------ target/linux/bcm27xx/bcm2710/config-5.4 | 6 ------ target/linux/bcm27xx/bcm2711/config-5.4 | 6 ------ 4 files changed, 24 deletions(-) (limited to 'target/linux/bcm27xx') diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4 index e953325050..57c176d168 100644 --- a/target/linux/bcm27xx/bcm2708/config-5.4 +++ b/target/linux/bcm27xx/bcm2708/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 @@ -146,7 +145,6 @@ CONFIG_DMADEVICES=y CONFIG_DMA_BCM2708=y CONFIG_DMA_BCM2835=y CONFIG_DMA_CMA=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_REMAP=y @@ -270,7 +268,6 @@ CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_KASAN_STACK=1 CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set CONFIG_LEDS_GPIO=y @@ -328,7 +325,6 @@ CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y @@ -392,11 +388,9 @@ CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_TINY_SRCU=y CONFIG_TMPFS_POSIX_ACL=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" # CONFIG_UID16 is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4 index e6b0cf1660..6713aef789 100644 --- a/target/linux/bcm27xx/bcm2709/config-5.4 +++ b/target/linux/bcm27xx/bcm2709/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 @@ -202,7 +201,6 @@ CONFIG_DMADEVICES=y CONFIG_DMA_BCM2708=y CONFIG_DMA_BCM2835=y CONFIG_DMA_CMA=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_REMAP=y @@ -351,7 +349,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_KASAN_STACK=1 CONFIG_KEYS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_INPUT=y @@ -421,7 +418,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y @@ -517,11 +513,9 @@ CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y # CONFIG_TRUSTED_FOUNDATIONS is not set -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" # CONFIG_UID16 is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNIX_SCM=y CONFIG_UNWINDER_ARM=y # CONFIG_UNWINDER_FRAME_POINTER is not set CONFIG_USB=y diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4 index 061ba7e3ab..7527c3fdd9 100644 --- a/target/linux/bcm27xx/bcm2710/config-5.4 +++ b/target/linux/bcm27xx/bcm2710/config-5.4 @@ -1,5 +1,4 @@ CONFIG_64BIT=y -CONFIG_64BIT_TIME=y # CONFIG_AIO is not set # CONFIG_ARCH_AGILEX is not set CONFIG_ARCH_BCM2835=y @@ -242,7 +241,6 @@ CONFIG_DMADEVICES=y CONFIG_DMA_BCM2708=y CONFIG_DMA_BCM2835=y CONFIG_DMA_CMA=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -427,7 +425,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_KASAN_STACK=1 CONFIG_KEYS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_INPUT=y @@ -498,7 +495,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_PADATA=y CONFIG_PARTITION_PERCPU=y @@ -594,9 +590,7 @@ CONFIG_TIMER_PROBE=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" -CONFIG_UNIX_SCM=y CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4 index 15ba843ea2..a813eb586c 100644 --- a/target/linux/bcm27xx/bcm2711/config-5.4 +++ b/target/linux/bcm27xx/bcm2711/config-5.4 @@ -1,5 +1,4 @@ CONFIG_64BIT=y -CONFIG_64BIT_TIME=y # CONFIG_AIO is not set # CONFIG_ARCH_AGILEX is not set CONFIG_ARCH_BCM2835=y @@ -247,7 +246,6 @@ CONFIG_DMADEVICES=y CONFIG_DMA_BCM2708=y CONFIG_DMA_BCM2835=y CONFIG_DMA_CMA=y -CONFIG_DMA_DECLARE_COHERENT=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y @@ -433,7 +431,6 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y -CONFIG_KASAN_STACK=1 CONFIG_KEYS=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGER_INPUT=y @@ -504,7 +501,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_OF_OVERLAY=y -CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_PADATA=y CONFIG_PARTITION_PERCPU=y @@ -605,9 +601,7 @@ CONFIG_TIMER_PROBE=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -CONFIG_UBSAN_ALIGNMENT=y CONFIG_UEVENT_HELPER_PATH="" -CONFIG_UNIX_SCM=y CONFIG_UNMAP_KERNEL_AT_EL0=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -- cgit v1.2.3