From 0aedf5cfcb0b52ccfb2caae7dce9bc5bb4efc46e Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Sat, 16 Feb 2019 10:36:07 +0000 Subject: [PATCH] armvirt: 32: refresh kernel config The diff was genereated by running the following command without actually changing any kernel config options make kernel_menuconfig CONFIG_TARGET=subtarget Here are some initial findings on the change - CONFIG_ARCH_OPTIONAL_KERNEL_RWX is now arch default - CONFIG_ARM_GIC_V3_ITS is selected by CONFIG_ARCH_VIRT - CONFIG_CPU_SPECTRE is select by CONFIG_CPU_V7 - CONFIG_TIMER_OF is now a arch default - CONFIG_TIMER_PROBE is select by CONFIG_TIMER_OF The following options should probably be moved to generic config - CONFIG_MIGRATION is a default on option - CONFIG_TREE_SRCU is a default on option for !PREEMPT && SMP system - CONFIG_RCU_NEED_SEGCBLIST Signed-off-by: Yousong Zhou --- target/linux/armvirt/32/config-default | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/target/linux/armvirt/32/config-default b/target/linux/armvirt/32/config-default index a3530b0e77..cdac5ffe56 100644 --- a/target/linux/armvirt/32/config-default +++ b/target/linux/armvirt/32/config-default @@ -1,4 +1,8 @@ CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MULTIPLATFORM=y @@ -6,6 +10,8 @@ CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_UPROBES=y @@ -15,6 +21,7 @@ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARM=y CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARM_L1_CACHE_SHIFT=6 @@ -27,7 +34,8 @@ CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set CONFIG_ARM_VIRT_EXT=y CONFIG_AUTO_ZRELADDR=y -# CONFIG_BINFMT_FLAT is not set +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_SCSI_REQUEST=y CONFIG_CACHE_L2X0=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y @@ -41,6 +49,8 @@ CONFIG_CPU_CP15_MMU=y CONFIG_CPU_HAS_ASID=y # CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_SPECTRE=y +CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V7=y CONFIG_CPU_V7=y CONFIG_DEBUG_BUGVERBOSE=y @@ -48,9 +58,14 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_USER is not set CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_GENERIC_ARCH_TOPOLOGY=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +# CONFIG_GRO_CELLS is not set CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_HAVE_CBPF_JIT=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_IDE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_OPROFILE=y @@ -59,8 +74,10 @@ CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_SMP=y CONFIG_HZ_FIXED=0 CONFIG_HZ_PERIODIC=y +# CONFIG_MDIO_BUS is not set CONFIG_MIGHT_HAVE_CACHE_L2X0=y CONFIG_MIGHT_HAVE_PCI=y +CONFIG_MIGRATION=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_MULTI_IRQ_HANDLER=y CONFIG_NEON=y @@ -74,12 +91,17 @@ CONFIG_PGTABLE_LEVELS=2 # CONFIG_PL310_ERRATA_727915 is not set # CONFIG_PL310_ERRATA_753970 is not set # CONFIG_PL310_ERRATA_769419 is not set +CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RTC_MC146818_LIB=y CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SG_POOL=y CONFIG_SMP_ON_UP=y CONFIG_SWP_EMULATE=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y # CONFIG_THUMB2_KERNEL is not set +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_TREE_SRCU=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_USE_OF=y CONFIG_VECTORS_BASE=0xffff0000 -- 2.30.2