kernel: add config option added in kernel 2.6.37-rc7 to generic and run make kernel_o...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24805 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm47xx/config-2.6.37 b/target/linux/brcm47xx/config-2.6.37
index 9feb722..3a4a714 100644 (file)
--- a/target/linux/brcm47xx/config-2.6.37
+++ b/target/linux/brcm47xx/config-2.6.37
@@ -1,6 +1,3 @@
-CONFIG_32BIT=y
-# CONFIG_ALCHEMY_GPIO_INDIRECT is not set
-# CONFIG_AR7 is not set

 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y


@@ -10,18 +7,16 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARPD is not set
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARPD is not set

+# CONFIG_AUTO_IRQ_AFFINITY is not set

 CONFIG_B44=y
 CONFIG_B44_PCI=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_BCM47XX=y
 CONFIG_BCM47XX_WDT=y
 CONFIG_B44=y
 CONFIG_B44_PCI=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_BCM47XX=y
 CONFIG_BCM47XX_WDT=y

-# CONFIG_BCM63XX is not set
-CONFIG_BITREVERSE=y
+CONFIG_BKL=y

 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BUG is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BUG is not set

-# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
-# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set

 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y


@@ -40,33 +35,38 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y

-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set

 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_FSNOTIFY is not set
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_FSNOTIFY is not set

+CONFIG_GENERIC_ATOMIC64=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_GPIO=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_GPIO=y

+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set

 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

-# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_GENERIC_PENDING_IRQ is not set
+# CONFIG_HARDIRQS_SW_RESEND is not set

 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAVE_ARCH_KGDB=y

+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_DMA_ATTRS=y

 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y

+CONFIG_HAVE_GENERIC_HARDIRQS=y

 CONFIG_HAVE_IDE=y
 CONFIG_HAVE_IDE=y

-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y

 CONFIG_HAVE_OPROFILE=y
 CONFIG_HAVE_OPROFILE=y

+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_HAVE_SPARSE_IRQ is not set

 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HZ=250


@@ -76,64 +76,34 @@ CONFIG_IMAGE_CMDLINE_HACK=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IRQ_CPU=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IRQ_CPU=y

+# CONFIG_IRQ_PER_CPU is not set

 CONFIG_KALLSYMS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_KALLSYMS=y
 CONFIG_LEDS_GPIO=y

-# CONFIG_LOONGSON_MC146818 is not set

 CONFIG_LOONGSON_UART_BASE=y
 CONFIG_LOONGSON_UART_BASE=y

-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_JZ4740 is not set
-# CONFIG_MACH_LOONGSON is not set
-# CONFIG_MACH_TX39XX is not set
-# CONFIG_MACH_TX49XX is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MIKROTIK_RB532 is not set
+CONFIG_MACH_NO_WESTBRIDGE=y

 CONFIG_MIPS=y
 CONFIG_MIPS=y

-# CONFIG_MIPS_ALCHEMY is not set
-# CONFIG_MIPS_COBALT is not set

 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set

-# CONFIG_MIPS_MALTA is not set

 CONFIG_MIPS_MT_DISABLED=y
 CONFIG_MIPS_MT_DISABLED=y

-# CONFIG_MIPS_SIM is not set

 CONFIG_MTD_BCM47XX=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_MTD_BCM47XX=y
 CONFIG_NEED_DMA_MAP_STATE=y

+CONFIG_NEED_PER_CPU_KM=y

 CONFIG_NO_HZ=y
 CONFIG_NO_HZ=y

-# CONFIG_NO_IOPORT is not set
-# CONFIG_NXP_STB220 is not set
-# CONFIG_NXP_STB225 is not set

 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PCI=y
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y

+CONFIG_PERF_USE_VMALLOC=y

 CONFIG_PHYLIB=y
 CONFIG_PHYLIB=y

-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_POWERTV is not set
+# CONFIG_PREEMPT_RCU is not set

 # CONFIG_PROC_KCORE is not set
 # CONFIG_PROC_KCORE is not set

-CONFIG_SCHED_OMIT_FRAME_POINTER=y
+# CONFIG_QUOTACTL is not set

 # CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_DMA is not set

-CONFIG_SCSI_MOD=y

 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
 # CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_MANY_PORTS is not set
 # CONFIG_SERIAL_8250_RSA is not set
 CONFIG_SERIAL_8250_SHARE_IRQ=y

-# CONFIG_SERIAL_MFD_HSU is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set

 CONFIG_SSB=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_BLOCKIO=y
 CONFIG_SSB=y
 CONFIG_SSB_B43_PCI_BRIDGE=y
 CONFIG_SSB_BLOCKIO=y


@@ -153,8 +123,6 @@ CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y

-# CONFIG_TC35815 is not set
-CONFIG_TRAD_SIGNALS=y

 CONFIG_USB_SUPPORT=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_USB_SUPPORT=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_ZONE_DMA_FLAG=0

diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37
index cbb1832..8b2b20c 100644 (file)
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@@ -643,6 +643,7 @@ CONFIG_FILE_LOCKING=y
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLAT_NODE_MEM_MAP=y

+CONFIG_FORCE_MAX_ZONEORDER=11

 # CONFIG_FORCEDETH is not set
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_FRAME_WARN=1024
 # CONFIG_FORCEDETH is not set
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_FRAME_WARN=1024