From c50f1f75367e973416c3fddba0e1a6edaa420f40 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sun, 27 May 2012 15:01:26 +0000 Subject: [PATCH] cobalt: switch to 3.3 and add broken flag Compile tested only. SVN-Revision: 31898 --- target/linux/cobalt/Makefile | 4 ++-- target/linux/cobalt/{config-default => config-3.3} | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) rename target/linux/cobalt/{config-default => config-3.3} (95%) diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile index 7d94ccd54a..48402222fe 100644 --- a/target/linux/cobalt/Makefile +++ b/target/linux/cobalt/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=cobalt BOARDNAME:=Cobalt Microservers -FEATURES:=targz pci ext4 +FEATURES:=targz pci ext4 broken CFLAGS:=-O2 -pipe -mtune=r5000 -fno-caller-saves MAINTAINER:=Florian Fainelli -LINUX_VERSION:=3.2.16 +LINUX_VERSION:=3.3.7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cobalt/config-default b/target/linux/cobalt/config-3.3 similarity index 95% rename from target/linux/cobalt/config-default rename to target/linux/cobalt/config-3.3 index 91979a2137..c29540eb9c 100644 --- a/target/linux/cobalt/config-default +++ b/target/linux/cobalt/config-3.3 @@ -1,12 +1,12 @@ # CONFIG_32BIT is not set CONFIG_64BIT=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_POPULATES_NODE_MAP=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 @@ -58,6 +58,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PCI_IOMAP=y # CONFIG_HAMRADIO is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y @@ -76,6 +77,8 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_GENERIC_HARDIRQS=y CONFIG_HAVE_IDE=y CONFIG_HAVE_IRQ_WORK=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_SYSCALL_WRAPPERS=y @@ -100,7 +103,6 @@ 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 @@ -117,7 +119,6 @@ CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_MIPS_L1_CACHE_SHIFT=5 # CONFIG_MIPS_MACHINE is not set CONFIG_MIPS_MT_DISABLED=y -# CONFIG_MISC_DEVICES is not set # CONFIG_MTD_BLOCK is not set # CONFIG_MTD_BLOCK_RO is not set # CONFIG_MTD_CFI is not set @@ -128,6 +129,7 @@ CONFIG_MTD_PHYSMAP=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NET_TULIP=y +CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y # CONFIG_PARTITION_ADVANCED is not set CONFIG_PATA_VIA=y -- 2.25.1