From 76a16170630c05175215b1e5909ad8bdc417e336 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Wed, 25 Sep 2013 16:39:23 +0000 Subject: [PATCH] ramips: sync 3.10 configs Signed-off-by: Gabor Juhos SVN-Revision: 38181 --- target/linux/ramips/rt288x/config-3.10 | 16 +++++++++------- target/linux/ramips/rt305x/config-3.10 | 4 +++- target/linux/ramips/rt3883/config-3.10 | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/rt288x/config-3.10 b/target/linux/ramips/rt288x/config-3.10 index 2b899b528b1..a3a12a9e7f7 100644 --- a/target/linux/ramips/rt288x/config-3.10 +++ b/target/linux/ramips/rt288x/config-3.10 @@ -1,7 +1,6 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_REQUIRE_GPIOLIB=y @@ -27,7 +26,7 @@ CONFIG_CPU_R4K_FPU=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CSRC_R4K=y -CONFIG_DECOMPRESS_LZMA=y +# CONFIG_DEBUG_PINCTRL is not set CONFIG_DMA_NONCOHERENT=y # CONFIG_DTB_RT2880_EVAL is not set CONFIG_DTB_RT_NONE=y @@ -37,9 +36,9 @@ CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_GPIO=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y @@ -66,6 +65,7 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_KVM=y CONFIG_HAVE_MACH_CLKDEV=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y @@ -75,6 +75,7 @@ CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=m +CONFIG_HZ_PERIODIC=y CONFIG_IMAGE_CMDLINE_HACK=y CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQCHIP=y @@ -107,7 +108,6 @@ CONFIG_NET_RALINK_MDIO_RT2880=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_DEVICE=y -# CONFIG_OF_DISPLAY_TIMING is not set CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y @@ -115,15 +115,17 @@ CONFIG_OF_IRQ=y CONFIG_OF_MDIO=y CONFIG_OF_MTD=y CONFIG_OF_NET=y -# CONFIG_OF_VIDEOMODE is not set CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PCI is not set CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y +# CONFIG_PINCONF is not set +CONFIG_PINCTRL=y +CONFIG_PINCTRL_RT2880=y +# CONFIG_PINCTRL_SINGLE is not set +CONFIG_PINMUX=y # CONFIG_PREEMPT_RCU is not set CONFIG_RALINK=y -# CONFIG_RALINK_ILL_ACC is not set -# CONFIG_RALINK_USBPHY is not set CONFIG_RALINK_WDT=y # CONFIG_RCU_STALL_COMMON is not set CONFIG_RESET_CONTROLLER=y diff --git a/target/linux/ramips/rt305x/config-3.10 b/target/linux/ramips/rt305x/config-3.10 index 93222447c85..78902d5ec91 100644 --- a/target/linux/ramips/rt305x/config-3.10 +++ b/target/linux/ramips/rt305x/config-3.10 @@ -34,6 +34,7 @@ CONFIG_DMA_NONCOHERENT=y # CONFIG_DTB_RT305X_EVAL is not set CONFIG_DTB_RT_NONE=y CONFIG_DTC=y +# CONFIG_DWC_OTG is not set CONFIG_EARLY_PRINTK=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -41,6 +42,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_GPIOLIB=y CONFIG_GPIO_DEVRES=y @@ -121,7 +123,7 @@ CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y # CONFIG_PINCONF is not set CONFIG_PINCTRL=y -CONFIG_PINCTRL_RALINK=y +CONFIG_PINCTRL_RT2880=y # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINMUX=y # CONFIG_PREEMPT_RCU is not set diff --git a/target/linux/ramips/rt3883/config-3.10 b/target/linux/ramips/rt3883/config-3.10 index c01a1e793bb..54b23258fdd 100644 --- a/target/linux/ramips/rt3883/config-3.10 +++ b/target/linux/ramips/rt3883/config-3.10 @@ -128,7 +128,7 @@ CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYLIB=y # CONFIG_PINCONF is not set CONFIG_PINCTRL=y -CONFIG_PINCTRL_RALINK=y +CONFIG_PINCTRL_RT2880=y # CONFIG_PINCTRL_SINGLE is not set CONFIG_PINMUX=y # CONFIG_PREEMPT_RCU is not set