Let vanilla follow changes made in default Signed-off-by: Matwey V. Kornilov --- config/armv7hl/vanilla | 69 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla index 9e159b1..51e1933 100644 --- a/config/armv7hl/vanilla +++ b/config/armv7hl/vanilla @@ -28,6 +28,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_GENERIC_BUG=y CONFIG_PGTABLE_LEVELS=2 CONFIG_SUSE_KERNEL=y +# CONFIG_SUSE_KERNEL_SUPPORTED is not set CONFIG_SPLIT_PACKAGE=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y @@ -108,7 +109,7 @@ CONFIG_TASK_IO_ACCOUNTING=y # # RCU Subsystem # -CONFIG_TREE_RCU=y +CONFIG_PREEMPT_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y # CONFIG_TASKS_RCU is not set @@ -212,7 +213,6 @@ CONFIG_HAVE_OPROFILE=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set -CONFIG_OPTPROBES=y CONFIG_UPROBES=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y @@ -314,11 +314,7 @@ CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_PADATA=y CONFIG_ASN1=y -CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -CONFIG_INLINE_READ_UNLOCK=y -CONFIG_INLINE_READ_UNLOCK_IRQ=y -CONFIG_INLINE_WRITE_UNLOCK=y -CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -771,9 +767,10 @@ CONFIG_NR_CPUS=16 CONFIG_HOTPLUG_CPU=y CONFIG_ARM_PSCI=y CONFIG_ARCH_NR_GPIO=1024 -CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set -# CONFIG_PREEMPT is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y CONFIG_HZ_FIXED=200 CONFIG_HZ=200 CONFIG_SCHED_HRTICK=y @@ -1111,6 +1108,7 @@ CONFIG_NF_CONNTRACK_PPTP=m CONFIG_NF_CONNTRACK_SANE=m CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CONNTRACK_SLP=m CONFIG_NF_CT_NETLINK=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_NETLINK_HELPER=m @@ -2755,6 +2753,8 @@ CONFIG_TI_CPSW_PHY_SEL=y CONFIG_TI_CPSW_ALE=m CONFIG_TI_CPSW=m # CONFIG_TI_CPTS is not set +CONFIG_TI_KEYSTONE_NETCP=m +CONFIG_TI_KEYSTONE_NETCP_ETHSS=m # CONFIG_TLAN is not set CONFIG_NET_VENDOR_VIA=y CONFIG_VIA_RHINE=m @@ -3522,6 +3522,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=2 CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_SERIAL_SH_SCI_DMA=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_CONSOLE_POLL=y @@ -3597,6 +3598,7 @@ CONFIG_TCG_TIS_ST33ZP24=m CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_TIS_ST33ZP24_SPI=m CONFIG_DEVPORT=y +CONFIG_CRASHER=m CONFIG_XILLYBUS=m # CONFIG_XILLYBUS_PCIE is not set CONFIG_XILLYBUS_OF=m @@ -3744,6 +3746,7 @@ CONFIG_SPI_S3C64XX=m # CONFIG_SPI_SC18IS602 is not set CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=m +CONFIG_SPI_SIRF=m CONFIG_SPI_ST_SSC4=m CONFIG_SPI_SUN4I=m CONFIG_SPI_SUN6I=m @@ -3864,7 +3867,7 @@ CONFIG_PINCTRL_IPQ8064=m CONFIG_PINCTRL_MSM8660=m CONFIG_PINCTRL_MSM8960=m CONFIG_PINCTRL_MSM8X74=m -# CONFIG_PINCTRL_MSM8916 is not set +CONFIG_PINCTRL_MSM8916=m CONFIG_PINCTRL_QCOM_SPMI_PMIC=m CONFIG_PINCTRL_QCOM_SSBI_PMIC=m CONFIG_PINCTRL_SAMSUNG=y @@ -4568,6 +4571,7 @@ CONFIG_REGULATOR_PBIAS=m CONFIG_REGULATOR_PFUZE100=m CONFIG_REGULATOR_PWM=m CONFIG_REGULATOR_QCOM_RPM=m +CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_RK808=m @@ -5999,6 +6003,7 @@ CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_SPEAR=m CONFIG_USB_EHCI_HCD_STI=m +# CONFIG_USB_EHCI_HCD_SYNOPSYS is not set CONFIG_USB_EHCI_MSM=m CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_EXYNOS=m @@ -6612,7 +6617,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_DMA_OF=y CONFIG_AMBA_PL08X=y CONFIG_AXI_DMAC=m -CONFIG_DMA_OMAP=y +CONFIG_DMA_OMAP=m CONFIG_DMA_SUN4I=m CONFIG_DMA_SUN6I=m CONFIG_FSL_EDMA=m @@ -6627,8 +6632,8 @@ CONFIG_MX3_IPU_IRQS=4 CONFIG_NBPFAXI_DMA=m CONFIG_PL330_DMA=y CONFIG_QCOM_BAM_DMA=m -# CONFIG_SIRF_DMA is not set -# CONFIG_STE_DMA40 is not set +CONFIG_SIRF_DMA=m +CONFIG_STE_DMA40=y CONFIG_TEGRA20_APB_DMA=y CONFIG_TI_CPPI41=m CONFIG_TI_DMA_CROSSBAR=y @@ -6641,11 +6646,12 @@ CONFIG_HSU_DMA=m CONFIG_HSU_DMA_PCI=m CONFIG_RENESAS_DMA=y CONFIG_SH_DMAE_BASE=y -# CONFIG_SH_DMAE is not set -# CONFIG_RCAR_DMAC is not set -# CONFIG_RCAR_HPB_DMAE is not set -# CONFIG_RENESAS_USB_DMAC is not set -# CONFIG_SUDMAC is not set +CONFIG_SH_DMAE=m +CONFIG_SH_DMAE_R8A73A4=y +CONFIG_RCAR_DMAC=m +CONFIG_RCAR_HPB_DMAE=m +CONFIG_RENESAS_USB_DMAC=m +CONFIG_SUDMAC=m # # DMA Clients @@ -7059,15 +7065,17 @@ CONFIG_RPMSG=m # # SOC (System On Chip) specific Drivers # -# CONFIG_MTK_INFRACFG is not set -# CONFIG_MTK_PMIC_WRAP is not set -# CONFIG_MTK_SCPSYS is not set +CONFIG_MTK_INFRACFG=y +CONFIG_MTK_PMIC_WRAP=m +CONFIG_MTK_SCPSYS=y CONFIG_QCOM_GSBI=m CONFIG_QCOM_PM=y -# CONFIG_QCOM_SMEM is not set +CONFIG_QCOM_SMD=m +CONFIG_QCOM_SMD_RPM=m +CONFIG_QCOM_SMEM=m CONFIG_SUNXI_SRAM=y CONFIG_SOC_TI=y -# CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set +CONFIG_KEYSTONE_NAVIGATOR_QMSS=m CONFIG_KEYSTONE_NAVIGATOR_DMA=m CONFIG_PM_DEVFREQ=y @@ -7088,7 +7096,7 @@ CONFIG_PM_DEVFREQ_EVENT=y CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y # CONFIG_EXTCON is not set CONFIG_MEMORY=y -# CONFIG_ARM_PL172_MPMC is not set +CONFIG_ARM_PL172_MPMC=m CONFIG_TI_AEMIF=m CONFIG_TI_EMIF=y CONFIG_OMAP_GPMC=y @@ -7841,6 +7849,7 @@ CONFIG_SCHEDSTATS=y CONFIG_SCHED_STACK_END_CHECK=y # CONFIG_DEBUG_TIMEKEEPING is not set CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_PREEMPT is not set # # Lock Debugging (spinlocks, mutexes, etc...) @@ -7900,6 +7909,7 @@ CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set +# CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y CONFIG_FTRACE_SYSCALLS=y CONFIG_TRACER_SNAPSHOT=y @@ -8170,7 +8180,16 @@ CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_MV_CESA=m # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set # CONFIG_CRYPTO_DEV_HIFN_795X is not set -# CONFIG_CRYPTO_DEV_FSL_CAAM is not set +CONFIG_CRYPTO_DEV_FSL_CAAM=m +CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 +# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m +CONFIG_CRYPTO_DEV_FSL_CAAM_IMX=y +CONFIG_CRYPTO_DEV_FSL_CAAM_LE=y +# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set CONFIG_CRYPTO_DEV_OMAP_SHAM=m CONFIG_CRYPTO_DEV_OMAP_AES=m CONFIG_CRYPTO_DEV_OMAP_DES=m -- 2.1.4 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org