diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-10 18:29:50 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-10 18:29:50 +0100 |
commit | c0011b3b7074f8b47cbec36177eff42b18871d4d (patch) | |
tree | 8bedce53f4bee4d288fdca28352fb6bff85dfc7f /target/lemote/patches | |
parent | e04d6dc7eff54a2b851b65dd6cbcc78b8f573f64 (diff) | |
parent | 3d2e9517d920b88abde391b59ca0069351be3a87 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/lemote/patches')
-rw-r--r-- | target/lemote/patches/lemote.patch | 40947 |
1 files changed, 40947 insertions, 0 deletions
diff --git a/target/lemote/patches/lemote.patch b/target/lemote/patches/lemote.patch new file mode 100644 index 000000000..edb778459 --- /dev/null +++ b/target/lemote/patches/lemote.patch @@ -0,0 +1,40947 @@ +diff -Nur linux-2.6.33/arch/mips/boot/compressed/dbg.c linux-lemote/arch/mips/boot/compressed/dbg.c +--- linux-2.6.33/arch/mips/boot/compressed/dbg.c 2010-02-24 19:52:17.000000000 +0100 ++++ linux-lemote/arch/mips/boot/compressed/dbg.c 2010-03-06 16:42:59.000000000 +0100 +@@ -9,7 +9,7 @@ + #include <linux/init.h> + #include <linux/types.h> + +-void __attribute__ ((weak)) putc(char c) ++void __weak putc(char c) + { + } + +diff -Nur linux-2.6.33/arch/mips/boot/compressed/decompress.c linux-lemote/arch/mips/boot/compressed/decompress.c +--- linux-2.6.33/arch/mips/boot/compressed/decompress.c 2010-02-24 19:52:17.000000000 +0100 ++++ linux-lemote/arch/mips/boot/compressed/decompress.c 2010-03-06 16:42:59.000000000 +0100 +@@ -5,8 +5,8 @@ + * Author: Matt Porter <mporter@mvista.com> Derived from + * arch/ppc/boot/prep/misc.c + * +- * Copyright (C) 2009 Lemote, Inc. & Institute of Computing Technology +- * Author: Wu Zhangjin <wuzj@lemote.com> ++ * Copyright (C) 2009 Lemote, Inc. ++ * Author: Wu Zhangjin <wuzhangjin@gmail.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the +diff -Nur linux-2.6.33/arch/mips/boot/compressed/ld.script linux-lemote/arch/mips/boot/compressed/ld.script +--- linux-2.6.33/arch/mips/boot/compressed/ld.script 2010-02-24 19:52:17.000000000 +0100 ++++ linux-lemote/arch/mips/boot/compressed/ld.script 2010-03-06 16:42:59.000000000 +0100 +@@ -2,7 +2,7 @@ + * ld.script for compressed kernel support of MIPS + * + * Copyright (C) 2009 Lemote Inc. +- * Author: Wu Zhangjin <wuzj@lemote.com> ++ * Author: Wu Zhangjin <wuzhangjin@gmail.com> + */ + + OUTPUT_ARCH(mips) +@@ -29,8 +29,8 @@ + __image_end = .; + CONSTRUCTORS + } +- .sdata : { *(.sdata) } +- . = ALIGN(4); ++ .sdata : { *(.sdata) } ++ . = ALIGN(4); + _edata = .; /* End of data section */ + + /* BSS */ +diff -Nur linux-2.6.33/arch/mips/boot/compressed/Makefile linux-lemote/arch/mips/boot/compressed/Makefile +--- linux-2.6.33/arch/mips/boot/compressed/Makefile 2010-02-24 19:52:17.000000000 +0100 ++++ linux-lemote/arch/mips/boot/compressed/Makefile 2010-03-06 16:42:59.000000000 +0100 +@@ -9,7 +9,7 @@ + # modified by Cort (cort@cs.nmt.edu) + # + # Copyright (C) 2009 Lemote Inc. & DSLab, Lanzhou University +-# Author: Wu Zhangjin <wuzj@lemote.com> ++# Author: Wu Zhangjin <wuzhangjin@gmail.com> + # + + # compressed kernel load addr: VMLINUZ_LOAD_ADDRESS > VMLINUX_LOAD_ADDRESS + VMLINUX_SIZE +@@ -27,15 +27,17 @@ + KBUILD_CFLAGS := $(shell echo $(KBUILD_CFLAGS) | sed -e "s/-pg//") + + KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \ +- -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" \ ++ -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) -D"VMLINUX_LOAD_ADDRESS_ULL=$(VMLINUX_LOAD_ADDRESS)ull" + + KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \ +- -DKERNEL_ENTRY=0x$(shell $(NM) $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | grep " kernel_entry" | cut -f1 -d \ ) \ +- -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) ++ -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \ ++ -DKERNEL_ENTRY=0x$(shell $(NM) $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | grep " kernel_entry" | cut -f1 -d \ ) + + obj-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o + ++ifdef CONFIG_DEBUG_ZBOOT + obj-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o ++endif + + OBJCOPYFLAGS_vmlinux.bin := $(OBJCOPYFLAGS) -O binary -R .comment -S + $(obj)/vmlinux.bin: $(KBUILD_IMAGE) +diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/mips/configs/fuloong2e_defconfig +--- linux-2.6.33/arch/mips/configs/fuloong2e_defconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-lemote/arch/mips/configs/fuloong2e_defconfig 2010-03-06 16:42:59.000000000 +0100 +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit +-# Linux kernel version: 2.6.32-rc4 +-# Fri Oct 16 13:18:01 2009 ++# Linux kernel version: 2.6.33 ++# Mon Mar 1 23:44:14 2010 + # + CONFIG_MIPS=y + +@@ -27,6 +27,7 @@ + # CONFIG_PNX8550_STB810 is not set + # CONFIG_PMC_MSP is not set + # CONFIG_PMC_YOSEMITE is not set ++# CONFIG_POWERTV is not set + # CONFIG_SGI_IP22 is not set + # CONFIG_SGI_IP27 is not set + # CONFIG_SGI_IP28 is not set +@@ -49,6 +50,8 @@ + # CONFIG_ALCHEMY_GPIO_INDIRECT is not set + CONFIG_ARCH_SPARSEMEM_ENABLE=y + CONFIG_LEMOTE_FULOONG2E=y ++# CONFIG_LEMOTE_MACH2F is not set ++CONFIG_LOONGSON_UART_BASE=y + CONFIG_RWSEM_GENERIC_SPINLOCK=y + # CONFIG_ARCH_HAS_ILOG2_U32 is not set + # CONFIG_ARCH_HAS_ILOG2_U64 is not set +@@ -67,7 +70,6 @@ + CONFIG_CSRC_R4K=y + CONFIG_DMA_NONCOHERENT=y + CONFIG_DMA_NEED_PCI_MAP_STATE=y +-CONFIG_EARLY_PRINTK=y + CONFIG_SYS_HAS_EARLY_PRINTK=y + CONFIG_I8259=y + # CONFIG_NO_IOPORT is not set +@@ -84,6 +86,7 @@ + # CPU selection + # + CONFIG_CPU_LOONGSON2E=y ++# CONFIG_CPU_LOONGSON2F is not set + # CONFIG_CPU_MIPS32_R1 is not set + # CONFIG_CPU_MIPS32_R2 is not set + # CONFIG_CPU_MIPS64_R1 is not set +@@ -106,7 +109,6 @@ + # CONFIG_CPU_SB1 is not set + # CONFIG_CPU_CAVIUM_OCTEON is not set + CONFIG_SYS_SUPPORTS_ZBOOT=y +-CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y + CONFIG_CPU_LOONGSON2=y + CONFIG_SYS_HAS_CPU_LOONGSON2E=y + CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +@@ -134,7 +136,6 @@ + CONFIG_GENERIC_IRQ_PROBE=y + CONFIG_CPU_SUPPORTS_HIGHMEM=y + CONFIG_SYS_SUPPORTS_HIGHMEM=y +-CONFIG_ARCH_FLATMEM_ENABLE=y + CONFIG_ARCH_POPULATES_NODE_MAP=y + CONFIG_SELECT_MEMORY_MODEL=y + # CONFIG_FLATMEM_MANUAL is not set +@@ -143,23 +144,18 @@ + CONFIG_SPARSEMEM=y + CONFIG_HAVE_MEMORY_PRESENT=y + CONFIG_SPARSEMEM_STATIC=y +- +-# +-# Memory hotplug is currently incompatible with Software Suspend +-# + CONFIG_PAGEFLAGS_EXTENDED=y + CONFIG_SPLIT_PTLOCK_CPUS=4 + CONFIG_PHYS_ADDR_T_64BIT=y + CONFIG_ZONE_DMA_FLAG=0 + CONFIG_VIRT_TO_BUS=y +-CONFIG_HAVE_MLOCK=y +-CONFIG_HAVE_MLOCKED_PAGE_BIT=y + # CONFIG_KSM is not set + CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 + CONFIG_TICK_ONESHOT=y + CONFIG_NO_HZ=y + CONFIG_HIGH_RES_TIMERS=y + CONFIG_GENERIC_CLOCKEVENTS_BUILD=y ++CONFIG_CPU_SUPPORTS_HR_SCHED_CLOCK=y + # CONFIG_HZ_48 is not set + # CONFIG_HZ_100 is not set + # CONFIG_HZ_128 is not set +@@ -190,9 +186,11 @@ + CONFIG_HAVE_KERNEL_GZIP=y + CONFIG_HAVE_KERNEL_BZIP2=y + CONFIG_HAVE_KERNEL_LZMA=y ++CONFIG_HAVE_KERNEL_LZO=y + CONFIG_KERNEL_GZIP=y + # CONFIG_KERNEL_BZIP2 is not set + # CONFIG_KERNEL_LZMA is not set ++# CONFIG_KERNEL_LZO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y + CONFIG_SYSVIPC_SYSCTL=y +@@ -208,6 +206,7 @@ + # + CONFIG_TREE_RCU=y + # CONFIG_TREE_PREEMPT_RCU is not set ++# CONFIG_TINY_RCU is not set + # CONFIG_RCU_TRACE is not set + CONFIG_RCU_FANOUT=64 + # CONFIG_RCU_FANOUT_EXACT is not set +@@ -217,8 +216,7 @@ + CONFIG_LOG_BUF_SHIFT=14 + # CONFIG_GROUP_SCHED is not set + # CONFIG_CGROUPS is not set +-CONFIG_SYSFS_DEPRECATED=y +-CONFIG_SYSFS_DEPRECATED_V2=y ++# CONFIG_SYSFS_DEPRECATED_V2 is not set + # CONFIG_RELAY is not set + CONFIG_NAMESPACES=y + # CONFIG_UTS_NS is not set +@@ -268,6 +266,7 @@ + # + # CONFIG_GCOV_KERNEL is not set + CONFIG_SLOW_WORK=y ++# CONFIG_SLOW_WORK_DEBUG is not set + CONFIG_HAVE_GENERIC_DMA_COHERENT=y + CONFIG_SLABINFO=y + CONFIG_RT_MUTEXES=y +@@ -287,14 +286,41 @@ + # IO Schedulers + # + CONFIG_IOSCHED_NOOP=y +-CONFIG_IOSCHED_AS=y + CONFIG_IOSCHED_DEADLINE=y + CONFIG_IOSCHED_CFQ=y +-# CONFIG_DEFAULT_AS is not set + # CONFIG_DEFAULT_DEADLINE is not set + CONFIG_DEFAULT_CFQ=y + # CONFIG_DEFAULT_NOOP is not set + CONFIG_DEFAULT_IOSCHED="cfq" ++# CONFIG_INLINE_SPIN_TRYLOCK is not set ++# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set ++# CONFIG_INLINE_SPIN_LOCK is not set ++# CONFIG_INLINE_SPIN_LOCK_BH is not set ++# CONFIG_INLINE_SPIN_LOCK_IRQ is not set ++# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set ++CONFIG_INLINE_SPIN_UNLOCK=y ++# CONFIG_INLINE_SPIN_UNLOCK_BH is not set ++CONFIG_INLINE_SPIN_UNLOCK_IRQ=y ++# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set ++# CONFIG_INLINE_READ_TRYLOCK is not set ++# CONFIG_INLINE_READ_LOCK is not set ++# CONFIG_INLINE_READ_LOCK_BH is not set ++# CONFIG_INLINE_READ_LOCK_IRQ is not set ++# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set ++CONFIG_INLINE_READ_UNLOCK=y ++# CONFIG_INLINE_READ_UNLOCK_BH is not set ++CONFIG_INLINE_READ_UNLOCK_IRQ=y ++# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set ++# CONFIG_INLINE_WRITE_TRYLOCK is not set ++# CONFIG_INLINE_WRITE_LOCK is not set ++# CONFIG_INLINE_WRITE_LOCK_BH is not set ++# CONFIG_INLINE_WRITE_LOCK_IRQ is not set ++# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set ++CONFIG_INLINE_WRITE_UNLOCK=y ++# CONFIG_INLINE_WRITE_UNLOCK_BH is not set ++CONFIG_INLINE_WRITE_UNLOCK_IRQ=y ++# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set ++# CONFIG_MUTEX_SPIN_ON_OWNER is not set + CONFIG_FREEZER=y + + # +@@ -340,7 +366,6 @@ + CONFIG_PM_STD_PARTITION="/dev/hda3" + # CONFIG_PM_RUNTIME is not set + CONFIG_NET=y +-CONFIG_COMPAT_NETLINK_MESSAGES=y + + # + # Networking options +@@ -491,10 +516,6 @@ + # CONFIG_AF_RXRPC is not set + CONFIG_WIRELESS=y + # CONFIG_CFG80211 is not set +-CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +-CONFIG_WIRELESS_OLD_REGULATORY=y +-CONFIG_WIRELESS_EXT=y +-CONFIG_WIRELESS_EXT_SYSFS=y + # CONFIG_LIB80211 is not set + + # +@@ -617,6 +638,10 @@ + # CONFIG_BLK_DEV_COW_COMMON is not set + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_CRYPTOLOOP=m ++ ++# ++# DRBD disabled because PROC_FS, INET or CONNECTOR not selected ++# + # CONFIG_BLK_DEV_NBD is not set + # CONFIG_BLK_DEV_SX8 is not set + # CONFIG_BLK_DEV_UB is not set +@@ -755,7 +780,7 @@ + # + + # +-# See the help texts for more information. ++# The newer stack is recommended. + # + # CONFIG_FIREWIRE is not set + # CONFIG_IEEE1394 is not set +@@ -798,6 +823,7 @@ + # CONFIG_SMC91X is not set + # CONFIG_DM9000 is not set + # CONFIG_ETHOC is not set ++# CONFIG_SMSC911X is not set + # CONFIG_NET_VENDOR_RACAL is not set + # CONFIG_DNET is not set + # CONFIG_NET_TULIP is not set +@@ -888,8 +914,10 @@ + # CONFIG_BE2NET is not set + # CONFIG_TR is not set + CONFIG_WLAN=y +-# CONFIG_WLAN_PRE80211 is not set +-# CONFIG_WLAN_80211 is not set ++# CONFIG_ATMEL is not set ++# CONFIG_PRISM54 is not set ++# CONFIG_USB_ZD1201 is not set ++# CONFIG_HOSTAP is not set + + # + # Enable WiMAX (Networking options) to see the WiMAX drivers +@@ -926,6 +954,7 @@ + # CONFIG_NETCONSOLE is not set + # CONFIG_NETPOLL is not set + # CONFIG_NET_POLL_CONTROLLER is not set ++# CONFIG_VMXNET3 is not set + # CONFIG_ISDN is not set + # CONFIG_PHONE is not set + +@@ -935,6 +964,7 @@ + CONFIG_INPUT=y + CONFIG_INPUT_FF_MEMLESS=y + # CONFIG_INPUT_POLLDEV is not set ++# CONFIG_INPUT_SPARSEKMAP is not set + + # + # Userland interfaces +@@ -992,6 +1022,7 @@ + # CONFIG_SERIO_PCIPS2 is not set + CONFIG_SERIO_LIBPS2=y + # CONFIG_SERIO_RAW is not set ++# CONFIG_SERIO_ALTERA_PS2 is not set + # CONFIG_GAMEPORT is not set + + # +@@ -1078,11 +1109,6 @@ + # CONFIG_I2C_TINY_USB is not set + + # +-# Graphics adapter I2C/DDC channel drivers +-# +-# CONFIG_I2C_VOODOO3 is not set +- +-# + # Other I2C/SMBus bus drivers + # + # CONFIG_I2C_ELEKTOR is not set +@@ -1093,7 +1119,6 @@ + # + # Miscellaneous I2C Chip support + # +-# CONFIG_DS1682 is not set + # CONFIG_SENSORS_TSL2550 is not set + # CONFIG_I2C_DEBUG_CORE is not set + # CONFIG_I2C_DEBUG_ALGO is not set +@@ -1125,7 +1150,6 @@ + # CONFIG_HTC_PASIC3 is not set + # CONFIG_MFD_TMIO is not set + # CONFIG_MFD_WM8400 is not set +-# CONFIG_MFD_WM831X is not set + # CONFIG_MFD_WM8350_I2C is not set + # CONFIG_MFD_PCF50633 is not set + # CONFIG_AB3100_CORE is not set +@@ -1271,6 +1295,7 @@ + # CONFIG_SND_OXYGEN is not set + # CONFIG_SND_CS4281 is not set + # CONFIG_SND_CS46XX is not set ++# CONFIG_SND_CS5535AUDIO is not set + # CONFIG_SND_CTXFI is not set + # CONFIG_SND_DARLA20 is not set + # CONFIG_SND_GINA20 is not set +@@ -1482,6 +1507,7 @@ + # TI VLYNQ + # + # CONFIG_STAGING is not set ++CONFIG_MIPS_PLATFORM_DEVICES=y + + # + # File systems +@@ -1522,8 +1548,8 @@ + # CONFIG_QUOTA is not set + CONFIG_AUTOFS_FS=y + CONFIG_AUTOFS4_FS=y +-CONFIG_FUSE_FS=y +-# CONFIG_CUSE is not set ++CONFIG_FUSE_FS=m ++CONFIG_CUSE=m + + # + # Caches +@@ -1700,6 +1726,11 @@ + # CONFIG_RCU_CPU_STALL_DETECTOR is not set + CONFIG_SYSCTL_SYSCALL_CHECK=y + CONFIG_NOP_TRACER=y ++CONFIG_HAVE_FUNCTION_TRACER=y ++CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y ++CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y ++CONFIG_HAVE_DYNAMIC_FTRACE=y ++CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y + CONFIG_RING_BUFFER=y + CONFIG_EVENT_TRACING=y + CONFIG_CONTEXT_SWITCH_TRACER=y +@@ -1710,6 +1741,7 @@ + # CONFIG_DYNAMIC_DEBUG is not set + # CONFIG_SAMPLES is not set + CONFIG_HAVE_ARCH_KGDB=y ++CONFIG_EARLY_PRINTK=y + # CONFIG_CMDLINE_BOOL is not set + + # +@@ -1718,7 +1750,11 @@ + # CONFIG_KEYS is not set + # CONFIG_SECURITY is not set + # CONFIG_SECURITYFS is not set +-CONFIG_SECURITY_FILE_CAPABILITIES=y ++# CONFIG_DEFAULT_SECURITY_SELINUX is not set ++# CONFIG_DEFAULT_SECURITY_SMACK is not set ++# CONFIG_DEFAULT_SECURITY_TOMOYO is not set ++CONFIG_DEFAULT_SECURITY_DAC=y ++CONFIG_DEFAULT_SECURITY="" + CONFIG_CRYPTO=y + + # +diff -Nur linux-2.6.33/arch/mips/configs/lemote2f_defconfig linux-lemote/arch/mips/configs/lemote2f_defconfig +--- linux-2.6.33/arch/mips/configs/lemote2f_defconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-lemote/arch/mips/configs/lemote2f_defconfig 2010-03-06 16:42:59.000000000 +0100 +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit +-# Linux kernel version: 2.6.32-rc6 +-# Mon Nov 9 23:42:42 2009 ++# Linux kernel version: 2.6.33 ++# Mon Mar 1 23:36:53 2010 + # + CONFIG_MIPS=y + +@@ -27,6 +27,7 @@ + # CONFIG_PNX8550_STB810 is not set + # CONFIG_PMC_MSP is not set + # CONFIG_PMC_YOSEMITE is not set ++# CONFIG_POWERTV is not set + # CONFIG_SGI_IP22 is not set + # CONFIG_SGI_IP27 is not set + # CONFIG_SGI_IP28 is not set +@@ -51,6 +52,9 @@ + # CONFIG_LEMOTE_FULOONG2E is not set + CONFIG_LEMOTE_MACH2F=y + CONFIG_CS5536=y ++CONFIG_CS5536_MFGPT=y ++CONFIG_LOONGSON_SUSPEND=y ++CONFIG_LOONGSON_UART_BASE=y + CONFIG_RWSEM_GENERIC_SPINLOCK=y + # CONFIG_ARCH_HAS_ILOG2_U32 is not set + # CONFIG_ARCH_HAS_ILOG2_U64 is not set +@@ -63,13 +67,8 @@ + CONFIG_GENERIC_CMOS_UPDATE=y + CONFIG_SCHED_OMIT_FRAME_POINTER=y + CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +-CONFIG_CEVT_R4K_LIB=y +-CONFIG_CEVT_R4K=y +-CONFIG_CSRC_R4K_LIB=y +-CONFIG_CSRC_R4K=y + CONFIG_DMA_NONCOHERENT=y + CONFIG_DMA_NEED_PCI_MAP_STATE=y +-CONFIG_EARLY_PRINTK=y + CONFIG_SYS_HAS_EARLY_PRINTK=y + CONFIG_I8259=y + # CONFIG_NO_IOPORT is not set +@@ -109,13 +108,15 @@ + # CONFIG_CPU_SB1 is not set + # CONFIG_CPU_CAVIUM_OCTEON is not set + CONFIG_SYS_SUPPORTS_ZBOOT=y +-CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y + CONFIG_CPU_LOONGSON2=y + CONFIG_SYS_HAS_CPU_LOONGSON2F=y + CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y + CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y + CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y + CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y ++CONFIG_CPU_SUPPORTS_CPUFREQ=y ++CONFIG_CPU_SUPPORTS_ADDRWINCFG=y ++CONFIG_CPU_SUPPORTS_UNCACHED_ACCELERATED=y + + # + # Kernel type +@@ -137,7 +138,6 @@ + CONFIG_GENERIC_IRQ_PROBE=y + CONFIG_CPU_SUPPORTS_HIGHMEM=y + CONFIG_SYS_SUPPORTS_HIGHMEM=y +-CONFIG_ARCH_FLATMEM_ENABLE=y + CONFIG_ARCH_POPULATES_NODE_MAP=y + CONFIG_SELECT_MEMORY_MODEL=y + # CONFIG_FLATMEM_MANUAL is not set +@@ -146,17 +146,11 @@ + CONFIG_SPARSEMEM=y + CONFIG_HAVE_MEMORY_PRESENT=y + CONFIG_SPARSEMEM_STATIC=y +- +-# +-# Memory hotplug is currently incompatible with Software Suspend +-# + CONFIG_PAGEFLAGS_EXTENDED=y + CONFIG_SPLIT_PTLOCK_CPUS=4 + CONFIG_PHYS_ADDR_T_64BIT=y + CONFIG_ZONE_DMA_FLAG=0 + CONFIG_VIRT_TO_BUS=y +-CONFIG_HAVE_MLOCK=y +-CONFIG_HAVE_MLOCKED_PAGE_BIT=y + # CONFIG_KSM is not set + CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 + CONFIG_TICK_ONESHOT=y +@@ -175,7 +169,7 @@ + # CONFIG_PREEMPT_NONE is not set + # CONFIG_PREEMPT_VOLUNTARY is not set + CONFIG_PREEMPT=y +-# CONFIG_KEXEC is not set ++CONFIG_KEXEC=y + # CONFIG_SECCOMP is not set + CONFIG_LOCKDEP_SUPPORT=y + CONFIG_STACKTRACE_SUPPORT=y +@@ -194,9 +188,11 @@ + CONFIG_HAVE_KERNEL_GZIP=y + CONFIG_HAVE_KERNEL_BZIP2=y + CONFIG_HAVE_KERNEL_LZMA=y +-# CONFIG_KERNEL_GZIP is not set ++CONFIG_HAVE_KERNEL_LZO=y ++CONFIG_KERNEL_GZIP=y + # CONFIG_KERNEL_BZIP2 is not set +-CONFIG_KERNEL_LZMA=y ++# CONFIG_KERNEL_LZMA is not set ++# CONFIG_KERNEL_LZO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y + CONFIG_SYSVIPC_SYSCTL=y +@@ -211,6 +207,7 @@ + # + CONFIG_TREE_RCU=y + # CONFIG_TREE_PREEMPT_RCU is not set ++# CONFIG_TINY_RCU is not set + # CONFIG_RCU_TRACE is not set + CONFIG_RCU_FANOUT=64 + # CONFIG_RCU_FANOUT_EXACT is not set +@@ -220,11 +217,15 @@ + CONFIG_LOG_BUF_SHIFT=15 + # CONFIG_GROUP_SCHED is not set + # CONFIG_CGROUPS is not set +-CONFIG_SYSFS_DEPRECATED=y +-CONFIG_SYSFS_DEPRECATED_V2=y ++# CONFIG_SYSFS_DEPRECATED_V2 is not set + # CONFIG_RELAY is not set + # CONFIG_NAMESPACES is not set +-# CONFIG_BLK_DEV_INITRD is not set ++CONFIG_BLK_DEV_INITRD=y ++CONFIG_INITRAMFS_SOURCE="" ++CONFIG_RD_GZIP=y ++CONFIG_RD_BZIP2=y ++CONFIG_RD_LZMA=y ++# CONFIG_RD_LZO is not set + # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set + CONFIG_SYSCTL=y + CONFIG_ANON_INODES=y +@@ -251,21 +252,24 @@ + # + CONFIG_VM_EVENT_COUNTERS=y + CONFIG_PCI_QUIRKS=y +-CONFIG_SLUB_DEBUG=y ++# CONFIG_SLUB_DEBUG is not set + CONFIG_COMPAT_BRK=y + # CONFIG_SLAB is not set + CONFIG_SLUB=y + # CONFIG_SLOB is not set +-# CONFIG_PROFILING is not set ++CONFIG_PROFILING=y ++CONFIG_TRACEPOINTS=y ++CONFIG_OPROFILE=m + CONFIG_HAVE_OPROFILE=y + CONFIG_HAVE_SYSCALL_WRAPPERS=y + + # + # GCOV-based kernel profiling + # +-# CONFIG_SLOW_WORK is not set ++# CONFIG_GCOV_KERNEL is not set ++CONFIG_SLOW_WORK=y ++# CONFIG_SLOW_WORK_DEBUG is not set + CONFIG_HAVE_GENERIC_DMA_COHERENT=y +-CONFIG_SLABINFO=y + CONFIG_RT_MUTEXES=y + CONFIG_BASE_SMALL=0 + CONFIG_MODULES=y +@@ -283,14 +287,41 @@ + # IO Schedulers + # + CONFIG_IOSCHED_NOOP=y +-CONFIG_IOSCHED_AS=y +-CONFIG_IOSCHED_DEADLINE=y ++CONFIG_IOSCHED_DEADLINE=m + CONFIG_IOSCHED_CFQ=y +-# CONFIG_DEFAULT_AS is not set + # CONFIG_DEFAULT_DEADLINE is not set + CONFIG_DEFAULT_CFQ=y + # CONFIG_DEFAULT_NOOP is not set + CONFIG_DEFAULT_IOSCHED="cfq" ++# CONFIG_INLINE_SPIN_TRYLOCK is not set ++# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set ++# CONFIG_INLINE_SPIN_LOCK is not set ++# CONFIG_INLINE_SPIN_LOCK_BH is not set ++# CONFIG_INLINE_SPIN_LOCK_IRQ is not set ++# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set ++# CONFIG_INLINE_SPIN_UNLOCK is not set ++# CONFIG_INLINE_SPIN_UNLOCK_BH is not set ++# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set ++# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set ++# CONFIG_INLINE_READ_TRYLOCK is not set ++# CONFIG_INLINE_READ_LOCK is not set ++# CONFIG_INLINE_READ_LOCK_BH is not set ++# CONFIG_INLINE_READ_LOCK_IRQ is not set ++# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set ++# CONFIG_INLINE_READ_UNLOCK is not set ++# CONFIG_INLINE_READ_UNLOCK_BH is not set ++# CONFIG_INLINE_READ_UNLOCK_IRQ is not set ++# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set ++# CONFIG_INLINE_WRITE_TRYLOCK is not set ++# CONFIG_INLINE_WRITE_LOCK is not set ++# CONFIG_INLINE_WRITE_LOCK_BH is not set ++# CONFIG_INLINE_WRITE_LOCK_IRQ is not set ++# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set ++# CONFIG_INLINE_WRITE_UNLOCK is not set ++# CONFIG_INLINE_WRITE_UNLOCK_BH is not set ++# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set ++# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set ++# CONFIG_MUTEX_SPIN_ON_OWNER is not set + CONFIG_FREEZER=y + + # +@@ -300,7 +331,7 @@ + CONFIG_PCI=y + CONFIG_PCI_DOMAINS=y + # CONFIG_ARCH_SUPPORTS_MSI is not set +-CONFIG_PCI_LEGACY=y ++# CONFIG_PCI_LEGACY is not set + # CONFIG_PCI_STUB is not set + # CONFIG_PCI_IOV is not set + CONFIG_ISA=y +@@ -314,7 +345,7 @@ + CONFIG_BINFMT_ELF=y + # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set + # CONFIG_HAVE_AOUT is not set +-# CONFIG_BINFMT_MISC is not set ++CONFIG_BINFMT_MISC=m + CONFIG_MIPS32_COMPAT=y + CONFIG_COMPAT=y + CONFIG_SYSVIPC_COMPAT=y +@@ -335,7 +366,33 @@ + CONFIG_HIBERNATION_NVS=y + CONFIG_HIBERNATION=y + CONFIG_PM_STD_PARTITION="/dev/hda3" +-# CONFIG_PM_RUNTIME is not set ++CONFIG_PM_RUNTIME=y ++CONFIG_MIPS_EXTERNAL_TIMER=y ++CONFIG_MIPS_CPUFREQ=y ++ ++# ++# CPU Frequency scaling ++# ++CONFIG_CPU_FREQ=y ++CONFIG_CPU_FREQ_TABLE=y ++CONFIG_CPU_FREQ_DEBUG=y ++CONFIG_CPU_FREQ_STAT=m ++CONFIG_CPU_FREQ_STAT_DETAILS=y ++# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set ++# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set ++# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set ++CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y ++# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set ++CONFIG_CPU_FREQ_GOV_PERFORMANCE=y ++CONFIG_CPU_FREQ_GOV_POWERSAVE=m ++CONFIG_CPU_FREQ_GOV_USERSPACE=m ++CONFIG_CPU_FREQ_GOV_ONDEMAND=y ++CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m ++ ++# ++# CPUFreq processor drivers ++# ++CONFIG_LOONGSON2_CPUFREQ=m + CONFIG_NET=y + CONFIG_COMPAT_NETLINK_MESSAGES=y + +@@ -346,11 +403,12 @@ + CONFIG_PACKET_MMAP=y + CONFIG_UNIX=y + CONFIG_XFRM=y +-# CONFIG_XFRM_USER is not set ++CONFIG_XFRM_USER=m + # CONFIG_XFRM_SUB_POLICY is not set + # CONFIG_XFRM_MIGRATE is not set + # CONFIG_XFRM_STATISTICS is not set +-# CONFIG_NET_KEY is not set ++CONFIG_NET_KEY=m ++# CONFIG_NET_KEY_MIGRATE is not set + CONFIG_INET=y + CONFIG_IP_MULTICAST=y + CONFIG_IP_ADVANCED_ROUTER=y +@@ -361,12 +419,13 @@ + CONFIG_IP_ROUTE_MULTIPATH=y + CONFIG_IP_ROUTE_VERBOSE=y + # CONFIG_IP_PNP is not set +-# CONFIG_NET_IPIP is not set +-# CONFIG_NET_IPGRE is not set ++CONFIG_NET_IPIP=m ++CONFIG_NET_IPGRE=m ++# CONFIG_NET_IPGRE_BROADCAST is not set + CONFIG_IP_MROUTE=y + CONFIG_IP_PIMSM_V1=y + CONFIG_IP_PIMSM_V2=y +-# CONFIG_ARPD is not set ++CONFIG_ARPD=y + CONFIG_SYN_COOKIES=y + # CONFIG_INET_AH is not set + # CONFIG_INET_ESP is not set +@@ -399,30 +458,34 @@ + # CONFIG_DEFAULT_WESTWOOD is not set + # CONFIG_DEFAULT_RENO is not set + CONFIG_DEFAULT_TCP_CONG="bic" +-# CONFIG_TCP_MD5SIG is not set ++CONFIG_TCP_MD5SIG=y + CONFIG_IPV6=m + CONFIG_IPV6_PRIVACY=y +-# CONFIG_IPV6_ROUTER_PREF is not set ++CONFIG_IPV6_ROUTER_PREF=y ++# CONFIG_IPV6_ROUTE_INFO is not set + # CONFIG_IPV6_OPTIMISTIC_DAD is not set + # CONFIG_INET6_AH is not set + # CONFIG_INET6_ESP is not set + # CONFIG_INET6_IPCOMP is not set + # CONFIG_IPV6_MIP6 is not set + # CONFIG_INET6_XFRM_TUNNEL is not set +-# CONFIG_INET6_TUNNEL is not set ++CONFIG_INET6_TUNNEL=m + CONFIG_INET6_XFRM_MODE_TRANSPORT=m + CONFIG_INET6_XFRM_MODE_TUNNEL=m + CONFIG_INET6_XFRM_MODE_BEET=m + # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set + CONFIG_IPV6_SIT=m ++# CONFIG_IPV6_SIT_6RD is not set + CONFIG_IPV6_NDISC_NODETYPE=y +-# CONFIG_IPV6_TUNNEL is not set +-# CONFIG_IPV6_MULTIPLE_TABLES is not set ++CONFIG_IPV6_TUNNEL=m ++CONFIG_IPV6_MULTIPLE_TABLES=y ++CONFIG_IPV6_SUBTREES=y + # CONFIG_IPV6_MROUTE is not set + CONFIG_NETWORK_SECMARK=y + CONFIG_NETFILTER=y + # CONFIG_NETFILTER_DEBUG is not set + CONFIG_NETFILTER_ADVANCED=y ++CONFIG_BRIDGE_NETFILTER=y + + # + # Core Netfilter Configuration +@@ -446,17 +509,22 @@ + # + # CONFIG_IP6_NF_QUEUE is not set + # CONFIG_IP6_NF_IPTABLES is not set ++# CONFIG_BRIDGE_NF_EBTABLES is not set + # CONFIG_IP_DCCP is not set + # CONFIG_IP_SCTP is not set + # CONFIG_RDS is not set + # CONFIG_TIPC is not set + # CONFIG_ATM is not set +-# CONFIG_BRIDGE is not set ++CONFIG_STP=m ++CONFIG_BRIDGE=m + # CONFIG_NET_DSA is not set +-# CONFIG_VLAN_8021Q is not set ++CONFIG_VLAN_8021Q=m ++# CONFIG_VLAN_8021Q_GVRP is not set + # CONFIG_DECNET is not set ++CONFIG_LLC=m + # CONFIG_LLC2 is not set +-# CONFIG_IPX is not set ++CONFIG_IPX=m ++# CONFIG_IPX_INTERN is not set + # CONFIG_ATALK is not set + # CONFIG_X25 is not set + # CONFIG_LAPB is not set +@@ -518,26 +586,64 @@ + # Network testing + # + # CONFIG_NET_PKTGEN is not set ++# CONFIG_NET_DROP_MONITOR is not set + # CONFIG_HAMRADIO is not set + # CONFIG_CAN is not set + # CONFIG_IRDA is not set +-# CONFIG_BT is not set ++CONFIG_BT=m ++CONFIG_BT_L2CAP=m ++CONFIG_BT_SCO=m ++CONFIG_BT_RFCOMM=m ++CONFIG_BT_RFCOMM_TTY=y ++CONFIG_BT_BNEP=m ++CONFIG_BT_BNEP_MC_FILTER=y ++CONFIG_BT_BNEP_PROTO_FILTER=y ++CONFIG_BT_HIDP=m ++ ++# ++# Bluetooth device drivers ++# ++CONFIG_BT_HCIBTUSB=m ++# CONFIG_BT_HCIBTSDIO is not set ++# CONFIG_BT_HCIUART is not set ++# CONFIG_BT_HCIBCM203X is not set ++# CONFIG_BT_HCIBPA10X is not set ++CONFIG_BT_HCIBFUSB=m ++CONFIG_BT_HCIVHCI=m ++# CONFIG_BT_MRVL is not set ++# CONFIG_BT_ATH3K is not set + # CONFIG_AF_RXRPC is not set + CONFIG_FIB_RULES=y + CONFIG_WIRELESS=y +-# CONFIG_CFG80211 is not set +-CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +-# CONFIG_WIRELESS_OLD_REGULATORY is not set + CONFIG_WIRELESS_EXT=y ++CONFIG_WEXT_CORE=y ++CONFIG_WEXT_PROC=y ++CONFIG_WEXT_PRIV=y ++CONFIG_CFG80211=m ++# CONFIG_NL80211_TESTMODE is not set ++# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set ++# CONFIG_CFG80211_REG_DEBUG is not set ++CONFIG_CFG80211_DEFAULT_PS=y ++# CONFIG_CFG80211_DEBUGFS is not set ++# CONFIG_WIRELESS_OLD_REGULATORY is not set ++CONFIG_CFG80211_WEXT=y + CONFIG_WIRELESS_EXT_SYSFS=y +-# CONFIG_LIB80211 is not set +- +-# +-# CFG80211 needs to be enabled for MAC80211 +-# ++CONFIG_LIB80211=m ++CONFIG_LIB80211_DEBUG=y ++CONFIG_MAC80211=m ++# CONFIG_MAC80211_RC_PID is not set ++CONFIG_MAC80211_RC_MINSTREL=y ++# CONFIG_MAC80211_RC_DEFAULT_PID is not set ++CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y ++CONFIG_MAC80211_RC_DEFAULT="minstrel" ++# CONFIG_MAC80211_MESH is not set ++CONFIG_MAC80211_LEDS=y ++# CONFIG_MAC80211_DEBUGFS is not set ++# CONFIG_MAC80211_DEBUG_MENU is not set + # CONFIG_WIMAX is not set + CONFIG_RFKILL=m +-# CONFIG_RFKILL_INPUT is not set ++CONFIG_RFKILL_LEDS=y ++CONFIG_RFKILL_INPUT=y + # CONFIG_NET_9P is not set + + # +@@ -555,7 +661,7 @@ + CONFIG_FIRMWARE_IN_KERNEL=y + CONFIG_EXTRA_FIRMWARE="" + # CONFIG_SYS_HYPERVISOR is not set +-# CONFIG_CONNECTOR is not set ++CONFIG_CONNECTOR=m + # CONFIG_MTD is not set + # CONFIG_PARPORT is not set + # CONFIG_PNP is not set +@@ -566,7 +672,8 @@ + # CONFIG_BLK_DEV_UMEM is not set + # CONFIG_BLK_DEV_COW_COMMON is not set + CONFIG_BLK_DEV_LOOP=y +-CONFIG_BLK_DEV_CRYPTOLOOP=y ++CONFIG_BLK_DEV_CRYPTOLOOP=m ++# CONFIG_BLK_DEV_DRBD is not set + # CONFIG_BLK_DEV_NBD is not set + # CONFIG_BLK_DEV_SX8 is not set + # CONFIG_BLK_DEV_UB is not set +@@ -577,19 +684,7 @@ + # CONFIG_CDROM_PKTCDVD is not set + # CONFIG_ATA_OVER_ETH is not set + # CONFIG_BLK_DEV_HD is not set +-CONFIG_MISC_DEVICES=y +-# CONFIG_PHANTOM is not set +-# CONFIG_SGI_IOC4 is not set +-# CONFIG_TIFM_CORE is not set +-# CONFIG_ENCLOSURE_SERVICES is not set +-# CONFIG_HP_ILO is not set +-# CONFIG_C2PORT is not set +- +-# +-# EEPROM support +-# +-# CONFIG_EEPROM_93CX6 is not set +-# CONFIG_CB710_CORE is not set ++# CONFIG_MISC_DEVICES is not set + CONFIG_HAVE_IDE=y + CONFIG_IDE=y + +@@ -619,8 +714,7 @@ + # + CONFIG_BLK_DEV_IDEPCI=y + # CONFIG_IDEPCI_PCIBUS_ORDER is not set +-# CONFIG_BLK_DEV_OFFBOARD is not set +-CONFIG_BLK_DEV_GENERIC=y ++# CONFIG_BLK_DEV_GENERIC is not set + # CONFIG_BLK_DEV_OPTI621 is not set + CONFIG_BLK_DEV_IDEDMA_PCI=y + # CONFIG_BLK_DEV_AEC62XX is not set +@@ -700,7 +794,29 @@ + # CONFIG_SCSI_DH is not set + # CONFIG_SCSI_OSD_INITIATOR is not set + # CONFIG_ATA is not set +-# CONFIG_MD is not set ++CONFIG_MD=y ++CONFIG_BLK_DEV_MD=m ++CONFIG_MD_LINEAR=m ++CONFIG_MD_RAID0=m ++CONFIG_MD_RAID1=m ++CONFIG_MD_RAID10=m ++CONFIG_MD_RAID456=m ++CONFIG_MD_RAID6_PQ=m ++# CONFIG_ASYNC_RAID6_TEST is not set ++CONFIG_MD_MULTIPATH=m ++CONFIG_MD_FAULTY=m ++CONFIG_BLK_DEV_DM=m ++CONFIG_DM_DEBUG=y ++CONFIG_DM_CRYPT=m ++CONFIG_DM_SNAPSHOT=m ++CONFIG_DM_MIRROR=m ++CONFIG_DM_LOG_USERSPACE=m ++CONFIG_DM_ZERO=m ++CONFIG_DM_MULTIPATH=m ++CONFIG_DM_MULTIPATH_QL=m ++CONFIG_DM_MULTIPATH_ST=m ++CONFIG_DM_DELAY=m ++CONFIG_DM_UEVENT=y + # CONFIG_FUSION is not set + + # +@@ -712,19 +828,19 @@ + # + + # +-# See the help texts for more information. ++# The newer stack is recommended. + # + # CONFIG_FIREWIRE is not set + # CONFIG_IEEE1394 is not set + # CONFIG_I2O is not set + CONFIG_NETDEVICES=y + # CONFIG_IFB is not set +-# CONFIG_DUMMY is not set ++CONFIG_DUMMY=m + # CONFIG_BONDING is not set + # CONFIG_MACVLAN is not set + # CONFIG_EQUALIZER is not set +-# CONFIG_TUN is not set +-# CONFIG_VETH is not set ++CONFIG_TUN=m ++CONFIG_VETH=m + # CONFIG_ARCNET is not set + # CONFIG_PHYLIB is not set + CONFIG_NET_ETHERNET=y +@@ -738,6 +854,7 @@ + # CONFIG_SMC91X is not set + # CONFIG_DM9000 is not set + # CONFIG_ETHOC is not set ++# CONFIG_SMSC911X is not set + # CONFIG_NET_VENDOR_RACAL is not set + # CONFIG_DNET is not set + # CONFIG_NET_TULIP is not set +@@ -767,9 +884,9 @@ + # CONFIG_NATSEMI is not set + # CONFIG_NE2K_PCI is not set + # CONFIG_8139CP is not set +-CONFIG_8139TOO=y ++CONFIG_8139TOO=m + # CONFIG_8139TOO_PIO is not set +-CONFIG_8139TOO_TUNE_TWISTER=y ++# CONFIG_8139TOO_TUNE_TWISTER is not set + # CONFIG_8139TOO_8129 is not set + # CONFIG_8139_OLD_RX_RESET is not set + # CONFIG_R6040 is not set +@@ -794,7 +911,8 @@ + # CONFIG_NS83820 is not set + # CONFIG_HAMACHI is not set + # CONFIG_YELLOWFIN is not set +-CONFIG_R8169=y ++CONFIG_R8169=m ++CONFIG_R8169_VLAN=y + # CONFIG_SIS190 is not set + # CONFIG_SKGE is not set + # CONFIG_SKY2 is not set +@@ -810,15 +928,31 @@ + # CONFIG_NETDEV_10000 is not set + # CONFIG_TR is not set + CONFIG_WLAN=y +-CONFIG_WLAN_PRE80211=y +-# CONFIG_STRIP is not set +-# CONFIG_WAVELAN is not set +-CONFIG_WLAN_80211=y +-# CONFIG_LIBERTAS is not set ++# CONFIG_LIBERTAS_THINFIRM is not set + # CONFIG_ATMEL is not set ++# CONFIG_AT76C50X_USB is not set + # CONFIG_PRISM54 is not set + # CONFIG_USB_ZD1201 is not set ++# CONFIG_USB_NET_RNDIS_WLAN is not set ++# CONFIG_RTL8180 is not set ++CONFIG_RTL8187B=m ++# CONFIG_ADM8211 is not set ++# CONFIG_MAC80211_HWSIM is not set ++# CONFIG_MWL8K is not set ++# CONFIG_ATH_COMMON is not set ++# CONFIG_B43 is not set ++# CONFIG_B43LEGACY is not set + # CONFIG_HOSTAP is not set ++# CONFIG_IPW2100 is not set ++# CONFIG_IPW2200 is not set ++# CONFIG_IWLWIFI is not set ++# CONFIG_IWM is not set ++# CONFIG_LIBERTAS is not set ++# CONFIG_HERMES is not set ++# CONFIG_P54_COMMON is not set ++# CONFIG_RT2X00 is not set ++# CONFIG_WL12XX is not set ++# CONFIG_ZD1211RW is not set + + # + # Enable WiMAX (Networking options) to see the WiMAX drivers +@@ -831,17 +965,39 @@ + # CONFIG_USB_KAWETH is not set + # CONFIG_USB_PEGASUS is not set + # CONFIG_USB_RTL8150 is not set +-# CONFIG_USB_USBNET is not set ++CONFIG_USB_USBNET=m ++CONFIG_USB_NET_AX8817X=m ++CONFIG_USB_NET_CDCETHER=m ++CONFIG_USB_NET_CDC_EEM=m ++# CONFIG_USB_NET_DM9601 is not set ++# CONFIG_USB_NET_SMSC95XX is not set ++# CONFIG_USB_NET_GL620A is not set ++CONFIG_USB_NET_NET1080=m ++# CONFIG_USB_NET_PLUSB is not set ++# CONFIG_USB_NET_MCS7830 is not set ++# CONFIG_USB_NET_RNDIS_HOST is not set ++CONFIG_USB_NET_CDC_SUBSET=m ++# CONFIG_USB_ALI_M5632 is not set ++# CONFIG_USB_AN2720 is not set ++CONFIG_USB_BELKIN=y ++CONFIG_USB_ARMLINUX=y ++# CONFIG_USB_EPSON2888 is not set ++# CONFIG_USB_KC2190 is not set ++CONFIG_USB_NET_ZAURUS=m + # CONFIG_USB_HSO is not set ++# CONFIG_USB_NET_INT51X1 is not set + # CONFIG_WAN is not set + # CONFIG_FDDI is not set + # CONFIG_HIPPI is not set + # CONFIG_PPP is not set + # CONFIG_SLIP is not set + # CONFIG_NET_FC is not set +-# CONFIG_NETCONSOLE is not set +-# CONFIG_NETPOLL is not set +-# CONFIG_NET_POLL_CONTROLLER is not set ++CONFIG_NETCONSOLE=m ++CONFIG_NETCONSOLE_DYNAMIC=y ++CONFIG_NETPOLL=y ++# CONFIG_NETPOLL_TRAP is not set ++CONFIG_NET_POLL_CONTROLLER=y ++# CONFIG_VMXNET3 is not set + # CONFIG_ISDN is not set + # CONFIG_PHONE is not set + +@@ -849,25 +1005,26 @@ + # Input device support + # + CONFIG_INPUT=y +-# CONFIG_INPUT_FF_MEMLESS is not set +-# CONFIG_INPUT_POLLDEV is not set ++CONFIG_INPUT_FF_MEMLESS=m ++CONFIG_INPUT_POLLDEV=m ++CONFIG_INPUT_SPARSEKMAP=m + + # + # Userland interfaces + # +-CONFIG_INPUT_MOUSEDEV=y ++CONFIG_INPUT_MOUSEDEV=m + CONFIG_INPUT_MOUSEDEV_PSAUX=y + CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 + CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 + # CONFIG_INPUT_JOYDEV is not set +-CONFIG_INPUT_EVDEV=y ++CONFIG_INPUT_EVDEV=m + # CONFIG_INPUT_EVBUG is not set + + # + # Input Device Drivers + # + CONFIG_INPUT_KEYBOARD=y +-CONFIG_KEYBOARD_ATKBD=y ++CONFIG_KEYBOARD_ATKBD=m + # CONFIG_KEYBOARD_LKKBD is not set + # CONFIG_KEYBOARD_NEWTON is not set + # CONFIG_KEYBOARD_OPENCORES is not set +@@ -875,7 +1032,7 @@ + # CONFIG_KEYBOARD_SUNKBD is not set + # CONFIG_KEYBOARD_XTKBD is not set + CONFIG_INPUT_MOUSE=y +-CONFIG_MOUSE_PS2=y ++CONFIG_MOUSE_PS2=m + # CONFIG_MOUSE_PS2_ALPS is not set + # CONFIG_MOUSE_PS2_LOGIPS2PP is not set + CONFIG_MOUSE_PS2_SYNAPTICS=y +@@ -884,7 +1041,7 @@ + # CONFIG_MOUSE_PS2_SENTELIC is not set + # CONFIG_MOUSE_PS2_TOUCHKIT is not set + # CONFIG_MOUSE_SERIAL is not set +-# CONFIG_MOUSE_APPLETOUCH is not set ++CONFIG_MOUSE_APPLETOUCH=m + # CONFIG_MOUSE_BCM5974 is not set + # CONFIG_MOUSE_INPORT is not set + # CONFIG_MOUSE_LOGIBM is not set +@@ -904,6 +1061,7 @@ + # CONFIG_SERIO_PCIPS2 is not set + CONFIG_SERIO_LIBPS2=y + # CONFIG_SERIO_RAW is not set ++# CONFIG_SERIO_ALTERA_PS2 is not set + # CONFIG_GAMEPORT is not set + + # +@@ -915,27 +1073,13 @@ + CONFIG_HW_CONSOLE=y + # CONFIG_VT_HW_CONSOLE_BINDING is not set + CONFIG_DEVKMEM=y +-CONFIG |