From 9fddeaf11317c0bb14ac9b2d1acb34d9c9b3e199 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 18 Apr 2012 15:36:33 +0000 Subject: [PATCH] [cobalt] switch to 3.2.15 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31345 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/cobalt/Makefile | 2 +- target/linux/cobalt/config-default | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile index b0de847411..e767c784eb 100644 --- a/target/linux/cobalt/Makefile +++ b/target/linux/cobalt/Makefile @@ -13,7 +13,7 @@ FEATURES:=targz pci ext4 CFLAGS:=-O2 -pipe -mtune=r5000 -fno-caller-saves MAINTAINER:=Florian Fainelli -LINUX_VERSION:=2.6.39.4 +LINUX_VERSION:=3.2.15 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-default index 89b9d6ae75..f75b90a477 100644 --- a/target/linux/cobalt/config-default +++ b/target/linux/cobalt/config-default @@ -7,11 +7,11 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_ARCH_SUPPORTS_MSI is not set -CONFIG_ARCH_SUPPORTS_OPROFILE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ARPD is not set CONFIG_ATA=y # CONFIG_ATH79 is not set +CONFIG_BCMA_POSSIBLE=y CONFIG_BINFMT_ELF32=y # CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_LOOP=y @@ -21,6 +21,9 @@ CONFIG_BLOCK_COMPAT=y CONFIG_CEVT_GT641XX=y CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K_LIB=y +CONFIG_CLKBLD_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_CLKSRC_I8253=y CONFIG_CMDLINE="console=ttyS0,115200" CONFIG_CMDLINE_BOOL=y # CONFIG_CMDLINE_OVERRIDE is not set @@ -58,8 +61,6 @@ CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_IRQ_SHOW=y # CONFIG_HAMRADIO is not set CONFIG_HAS_DMA=y @@ -92,7 +93,6 @@ CONFIG_HZ=250 CONFIG_HZ_250=y CONFIG_I8253=y CONFIG_I8259=y -CONFIG_INOTIFY_USER=y CONFIG_INPUT=y CONFIG_INPUT_COBALT_BTNS=y CONFIG_INPUT_EVDEV=y @@ -100,16 +100,17 @@ CONFIG_INPUT_POLLDEV=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_MULTICAST is not set CONFIG_IRQ_CPU=y +CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_GT641XX=y # CONFIG_JFFS2_FS is not set CONFIG_KEXEC=y +# CONFIG_LANTIQ is not set CONFIG_LEDS_COBALT_QUBE=y CONFIG_LEDS_COBALT_RAQ=y # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set # CONFIG_LEDS_TRIGGER_TIMER is not set CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_MACH_NO_WESTBRIDGE=y # CONFIG_MII is not set # CONFIG_MINIX_FS_NATIVE_ENDIAN is not set CONFIG_MIPS=y @@ -122,6 +123,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MACHINE is not set CONFIG_MIPS_MT_DISABLED=y # CONFIG_MISC_DEVICES is not set +# CONFIG_MLX4_CORE is not set # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI is not set @@ -131,8 +133,6 @@ CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_PHYSMAP=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NET_PCI is not set CONFIG_NET_TULIP=y CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PARTITION_ADVANCED is not set @@ -141,7 +141,6 @@ CONFIG_PCI=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_GT64XXX_PCI0=y -CONFIG_PCSPKR_PLATFORM=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y # CONFIG_PREEMPT_RCU is not set @@ -174,6 +173,7 @@ CONFIG_TULIP_MWI=y CONFIG_TULIP_NAPI=y CONFIG_TULIP_NAPI_HW_MITIGATION=y # CONFIG_ULI526X is not set +CONFIG_USB_ARCH_HAS_XHCI=y CONFIG_USB_SUPPORT=y # CONFIG_VGA_CONSOLE is not set # CONFIG_VLAN_8021Q is not set -- 2.11.0