diff options
Diffstat (limited to 'target/lemote')
| -rw-r--r-- | target/lemote/Makefile | 14 | ||||
| -rw-r--r-- | target/lemote/kernel.config | 70 | ||||
| -rw-r--r-- | target/lemote/patches/lemote.patch | 11027 | ||||
| -rw-r--r-- | target/lemote/target.mk | 4 |
4 files changed, 6709 insertions, 4406 deletions
diff --git a/target/lemote/Makefile b/target/lemote/Makefile index fa554dfaf..59e2b84b1 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -10,16 +10,6 @@ include $(TOPDIR)/mk/image.mk kernel-install: @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -createinit: - @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.* $(MAKE_TRACE) - $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \ - $(LINUX_DIR)/.config - echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) - $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" $(MAKE_TRACE) - @cp $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - createinitcrypt: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config @@ -70,13 +60,13 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) -imageinstall: $(BIN_DIR)/$(INITRAMFS) createinit +imageinstall: $(BIN_DIR)/$(INITRAMFS) @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs-piggyback) -imageinstall: $(BIN_DIR)/$(INITRAMFS) createinit +imageinstall: $(BUILD_DIR)/$(INITRAMFS_PIGGYBACK) createinitramfs @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config index 33c8305bc..c109120a0 100644 --- a/target/lemote/kernel.config +++ b/target/lemote/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.33 -# Sun Mar 7 13:18:48 2010 +# Linux kernel version: 2.6.34 +# Fri May 28 12:08:04 2010 # CONFIG_MIPS=y @@ -68,12 +68,13 @@ CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_DMA_NONCOHERENT=y -CONFIG_DMA_NEED_PCI_MAP_STATE=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_SYS_HAS_EARLY_PRINTK=y CONFIG_I8259=y # CONFIG_NO_IOPORT is not set CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y +CONFIG_GENERIC_GPIO=y # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y @@ -107,7 +108,9 @@ CONFIG_CPU_LOONGSON2F=y # CONFIG_CPU_RM9000 is not set # CONFIG_CPU_SB1 is not set # CONFIG_CPU_CAVIUM_OCTEON is not set +# CONFIG_CPU_LOONGSON2F_WORKAROUNDS 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 @@ -132,6 +135,7 @@ CONFIG_BOARD_SCACHE=y CONFIG_MIPS_MT_DISABLED=y # CONFIG_MIPS_MT_SMP is not set # CONFIG_MIPS_MT_SMTC is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_CPU_HAS_WB=y CONFIG_CPU_HAS_SYNC=y CONFIG_GENERIC_HARDIRQS=y @@ -214,7 +218,6 @@ CONFIG_RCU_FANOUT=64 CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=15 -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set @@ -320,7 +323,6 @@ CONFIG_HW_HAS_PCI=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y # CONFIG_ARCH_SUPPORTS_MSI is not set -# CONFIG_PCI_LEGACY is not set # CONFIG_PCI_STUB is not set # CONFIG_PCI_IOV is not set CONFIG_ISA=y @@ -356,6 +358,7 @@ CONFIG_HIBERNATION_NVS=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="/dev/mapper/swap" # CONFIG_PM_RUNTIME is not set +CONFIG_PM_OPS=y CONFIG_MIPS_EXTERNAL_TIMER=y CONFIG_MIPS_CPUFREQ=y @@ -388,7 +391,6 @@ CONFIG_NET=y # Networking options # CONFIG_PACKET=y -CONFIG_PACKET_MMAP=y CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y @@ -508,6 +510,7 @@ CONFIG_HAVE_IDE=y # # SCSI device support # +CONFIG_SCSI_MOD=y # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y CONFIG_SCSI_DMA=y @@ -667,6 +670,7 @@ CONFIG_NET_PCI=y # CONFIG_AMD8111_ETH is not set # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_AC3200 is not set +# CONFIG_KSZ884X_PCI is not set # CONFIG_APRICOT is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set @@ -714,6 +718,7 @@ CONFIG_WLAN=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set +# CONFIG_USB_IPHETH is not set # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set @@ -752,6 +757,8 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=600 CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_MATRIX is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set # CONFIG_KEYBOARD_STOWAWAY is not set @@ -773,6 +780,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y # CONFIG_MOUSE_LOGIBM is not set # CONFIG_MOUSE_PC110PAD is not set # CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -818,6 +826,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_TIMBERDALE is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -836,6 +845,34 @@ CONFIG_DEVPORT=y # PPS support # # CONFIG_PPS is not set +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO expanders: +# +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_SCH is not set + +# +# I2C GPIO expanders: +# + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_CS5535 is not set +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_LANGWELL is not set + +# +# SPI GPIO expanders: +# + +# +# AC97 GPIO expanders: +# # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set @@ -854,6 +891,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SIS5595 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47B397 is not set @@ -878,6 +916,8 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_TIMBERDALE is not set +# CONFIG_LPC_SCH is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -885,6 +925,7 @@ CONFIG_SSB_POSSIBLE=y # Graphics support # CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_DRM is not set # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=y @@ -1003,8 +1044,6 @@ CONFIG_USB=y # CONFIG_USB_DEVICEFS is not set # CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_SUSPEND=y -# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set @@ -1072,7 +1111,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set -# CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set @@ -1085,12 +1123,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_VST is not set # CONFIG_USB_GADGET is not set # # OTG and related infrastructure # +# CONFIG_USB_GPIO_VBUS is not set # CONFIG_NOP_USB_XCEIV is not set # CONFIG_UWB is not set CONFIG_MMC=y @@ -1109,8 +1147,6 @@ CONFIG_MMC_BLOCK_BOUNCE=y # MMC/SD/SDIO Host Controller Drivers # # CONFIG_MMC_SDHCI is not set -# CONFIG_MMC_AT91 is not set -# CONFIG_MMC_ATMELMCI is not set # CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_CB710 is not set # CONFIG_MMC_VIA_SDMMC is not set @@ -1167,13 +1203,14 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_USB_IP_COMMON is not set +# CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_COMEDI is not set # CONFIG_ASUS_OLED is not set -# CONFIG_ALTERA_PCIE_CHDMA is not set # CONFIG_R8187SE is not set +# CONFIG_RTL8192SU is not set +# CONFIG_RTL8192U is not set # CONFIG_RTL8192E is not set -# CONFIG_INPUT_MIMIO is not set # CONFIG_TRANZPORT is not set # @@ -1185,9 +1222,7 @@ CONFIG_STAGING=y # # CONFIG_INPUT_GPIO is not set # CONFIG_POHMELFS is not set -# CONFIG_B3DFG is not set # CONFIG_IDE_PHISON is not set -# CONFIG_PLAN9AUTH is not set # CONFIG_VT6655 is not set # CONFIG_VT6656 is not set # CONFIG_FB_UDL is not set @@ -1203,6 +1238,8 @@ CONFIG_STAGING=y # CONFIG_STRIP is not set # CONFIG_WAVELAN is not set CONFIG_FB_SM7XX=y +# CONFIG_DT3155 is not set +# CONFIG_CRYSTALHD is not set CONFIG_MIPS_PLATFORM_DEVICES=y CONFIG_LEMOTE_YEELOONG2F=y # CONFIG_LEMOTE_LYNLOONG2F is not set @@ -1267,6 +1304,7 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set # CONFIG_SMB_FS is not set +# CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set diff --git a/target/lemote/patches/lemote.patch b/target/lemote/patches/lemote.patch index edb778459..31af80bb6 100644 --- a/target/lemote/patches/lemote.patch +++ b/target/lemote/patches/lemote.patch @@ -1,32 +1,6 @@ -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 +diff -Nur linux-2.6.34.orig/arch/mips/boot/compressed/ld.script linux-loongson/arch/mips/boot/compressed/ld.script +--- linux-2.6.34.orig/arch/mips/boot/compressed/ld.script 2010-05-16 23:17:36.000000000 +0200 ++++ linux-loongson/arch/mips/boot/compressed/ld.script 2010-05-27 18:12:28.592215840 +0200 @@ -2,7 +2,7 @@ * ld.script for compressed kernel support of MIPS * @@ -36,60 +10,16 @@ diff -Nur linux-2.6.33/arch/mips/boot/compressed/ld.script linux-lemote/arch/mip */ 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 +diff -Nur linux-2.6.34.orig/arch/mips/configs/fuloong2e_defconfig linux-loongson/arch/mips/configs/fuloong2e_defconfig +--- linux-2.6.34.orig/arch/mips/configs/fuloong2e_defconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-loongson/arch/mips/configs/fuloong2e_defconfig 2010-05-27 18:12:28.602215969 +0200 @@ -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 ++# Linux kernel version: 2.6.34-rc5 ++# Wed Apr 28 01:14:53 2010 # CONFIG_MIPS=y @@ -110,11 +40,13 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m 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 @@ +@@ -66,8 +69,7 @@ + CONFIG_CSRC_R4K_LIB=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y - CONFIG_DMA_NEED_PCI_MAP_STATE=y +-CONFIG_DMA_NEED_PCI_MAP_STATE=y -CONFIG_EARLY_PRINTK=y ++CONFIG_NEED_DMA_MAP_STATE=y CONFIG_SYS_HAS_EARLY_PRINTK=y CONFIG_I8259=y # CONFIG_NO_IOPORT is not set @@ -134,7 +66,14 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m CONFIG_CPU_LOONGSON2=y CONFIG_SYS_HAS_CPU_LOONGSON2E=y CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y -@@ -134,7 +136,6 @@ +@@ -128,13 +130,13 @@ + CONFIG_MIPS_MT_DISABLED=y + # CONFIG_MIPS_MT_SMP is not set + # CONFIG_MIPS_MT_SMTC is not set ++# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set + CONFIG_CPU_HAS_WB=y + CONFIG_CPU_HAS_SYNC=y + CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_SYS_SUPPORTS_HIGHMEM=y @@ -142,7 +81,7 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_FLATMEM_MANUAL is not set -@@ -143,23 +144,18 @@ +@@ -143,23 +145,18 @@ CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y @@ -167,7 +106,7 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_HZ_48 is not set # CONFIG_HZ_100 is not set # CONFIG_HZ_128 is not set -@@ -190,9 +186,11 @@ +@@ -190,9 +187,11 @@ CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y @@ -179,7 +118,7 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -@@ -208,6 +206,7 @@ +@@ -208,6 +207,7 @@ # CONFIG_TREE_RCU=y # CONFIG_TREE_PREEMPT_RCU is not set @@ -187,9 +126,11 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=64 # CONFIG_RCU_FANOUT_EXACT is not set -@@ -217,8 +216,7 @@ +@@ -215,10 +215,8 @@ + CONFIG_IKCONFIG=y + CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 - # CONFIG_GROUP_SCHED is not set +-# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y @@ -197,15 +138,23 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_RELAY is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set -@@ -268,6 +266,7 @@ +@@ -258,7 +256,6 @@ + # CONFIG_SLUB is not set + # CONFIG_SLOB is not set + CONFIG_PROFILING=y +-CONFIG_TRACEPOINTS=y + CONFIG_OPROFILE=m + CONFIG_HAVE_OPROFILE=y + CONFIG_HAVE_SYSCALL_WRAPPERS=y +@@ -266,7 +263,6 @@ # - # CONFIG_GCOV_KERNEL is not set + # GCOV-based kernel profiling + # +-# 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 @@ +@@ -287,14 +283,41 @@ # IO Schedulers # CONFIG_IOSCHED_NOOP=y @@ -249,15 +198,39 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m CONFIG_FREEZER=y # -@@ -340,7 +366,6 @@ +@@ -304,7 +327,6 @@ + CONFIG_PCI=y + CONFIG_PCI_DOMAINS=y + # CONFIG_ARCH_SUPPORTS_MSI is not set +-CONFIG_PCI_LEGACY=y + # CONFIG_PCI_STUB is not set + # CONFIG_PCI_IOV is not set + CONFIG_ISA=y +@@ -339,14 +361,13 @@ + CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="/dev/hda3" # CONFIG_PM_RUNTIME is not set ++CONFIG_PM_OPS=y CONFIG_NET=y -CONFIG_COMPAT_NETLINK_MESSAGES=y # # Networking options -@@ -491,10 +516,6 @@ + # + CONFIG_PACKET=y +-CONFIG_PACKET_MMAP=y + CONFIG_UNIX=y + CONFIG_XFRM=y + # CONFIG_XFRM_USER is not set +@@ -483,7 +504,6 @@ + # 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 +@@ -491,10 +511,6 @@ # CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y # CONFIG_CFG80211 is not set @@ -268,7 +241,7 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_LIB80211 is not set # -@@ -617,6 +638,10 @@ +@@ -617,6 +633,10 @@ # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=m @@ -279,7 +252,15 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # 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 @@ +@@ -707,6 +727,7 @@ + # + # SCSI device support + # ++CONFIG_SCSI_MOD=y + # CONFIG_RAID_ATTRS is not set + CONFIG_SCSI=y + CONFIG_SCSI_DMA=y +@@ -755,7 +776,7 @@ # # @@ -288,7 +269,15 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # # CONFIG_FIREWIRE is not set # CONFIG_IEEE1394 is not set -@@ -798,6 +823,7 @@ +@@ -764,6 +785,7 @@ + # CONFIG_DUMMY is not set + # CONFIG_BONDING is not set + CONFIG_MACVLAN=m ++# CONFIG_MACVTAP is not set + # CONFIG_EQUALIZER is not set + # CONFIG_TUN is not set + CONFIG_VETH=m +@@ -798,6 +820,7 @@ # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set # CONFIG_ETHOC is not set @@ -296,7 +285,30 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_DNET is not set # CONFIG_NET_TULIP is not set -@@ -888,8 +914,10 @@ +@@ -817,6 +840,7 @@ + # CONFIG_AMD8111_ETH is not set + # CONFIG_ADAPTEC_STARFIRE is not set + # CONFIG_AC3200 is not set ++# CONFIG_KSZ884X_PCI is not set + # CONFIG_APRICOT is not set + # CONFIG_B44 is not set + # CONFIG_FORCEDETH is not set +@@ -871,6 +895,8 @@ + # CONFIG_CHELSIO_T1 is not set + CONFIG_CHELSIO_T3_DEPENDS=y + # CONFIG_CHELSIO_T3 is not set ++CONFIG_CHELSIO_T4_DEPENDS=y ++# CONFIG_CHELSIO_T4 is not set + # CONFIG_ENIC is not set + # CONFIG_IXGBE is not set + # CONFIG_IXGB is not set +@@ -883,13 +909,16 @@ + # CONFIG_MLX4_CORE is not set + # CONFIG_TEHUTI is not set + # CONFIG_BNX2X is not set ++# CONFIG_QLCNIC is not set + # CONFIG_QLGE is not set + # CONFIG_SFC is not set # CONFIG_BE2NET is not set # CONFIG_TR is not set CONFIG_WLAN=y @@ -309,7 +321,15 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # # Enable WiMAX (Networking options) to see the WiMAX drivers -@@ -926,6 +954,7 @@ +@@ -904,6 +933,7 @@ + # CONFIG_USB_RTL8150 is not set + # CONFIG_USB_USBNET is not set + # CONFIG_USB_CDC_PHONET is not set ++# CONFIG_USB_IPHETH is not set + # CONFIG_WAN is not set + # CONFIG_FDDI is not set + # CONFIG_HIPPI is not set +@@ -926,6 +956,7 @@ # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set @@ -317,7 +337,7 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_ISDN is not set # CONFIG_PHONE is not set -@@ -935,6 +964,7 @@ +@@ -935,6 +966,7 @@ CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=y # CONFIG_INPUT_POLLDEV is not set @@ -325,7 +345,7 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # # Userland interfaces -@@ -992,6 +1022,7 @@ +@@ -992,6 +1024,7 @@ # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set @@ -333,7 +353,23 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_GAMEPORT is not set # -@@ -1078,11 +1109,6 @@ +@@ -1022,6 +1055,7 @@ + CONFIG_SERIAL_CORE=y + CONFIG_SERIAL_CORE_CONSOLE=y + # CONFIG_SERIAL_JSM is not set ++# CONFIG_SERIAL_TIMBERDALE is not set + CONFIG_UNIX98_PTYS=y + # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set + CONFIG_LEGACY_PTYS=y +@@ -1069,6 +1103,7 @@ + # + # CONFIG_I2C_OCORES is not set + # CONFIG_I2C_SIMTEC is not set ++# CONFIG_I2C_XILINX is not set + + # + # External I2C/SMBus adapter drivers +@@ -1078,27 +1113,15 @@ # CONFIG_I2C_TINY_USB is not set # @@ -345,23 +381,44 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # Other I2C/SMBus bus drivers # # CONFIG_I2C_ELEKTOR is not set -@@ -1093,7 +1119,6 @@ - # - # Miscellaneous I2C Chip support - # + # CONFIG_I2C_PCA_ISA is not set + # CONFIG_I2C_PCA_PLATFORM is not set + # CONFIG_I2C_STUB is not set +- +-# +-# Miscellaneous I2C Chip support +-# -# CONFIG_DS1682 is not set - # CONFIG_SENSORS_TSL2550 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_I2C_DEBUG_BUS is not set +-# CONFIG_I2C_DEBUG_CHIP is not set + # CONFIG_SPI is not set + + # +@@ -1125,10 +1148,9 @@ # 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_WM8350_I2C is not set ++# CONFIG_MFD_WM8994 is not set # CONFIG_MFD_PCF50633 is not set - # CONFIG_AB3100_CORE is not set -@@ -1271,6 +1295,7 @@ +-# CONFIG_AB3100_CORE is not set ++# CONFIG_LPC_SCH is not set + # CONFIG_REGULATOR is not set + # CONFIG_MEDIA_SUPPORT is not set + +@@ -1136,6 +1158,7 @@ + # Graphics support + # + CONFIG_VGA_ARB=y ++CONFIG_VGA_ARB_MAX_GPUS=16 + # CONFIG_DRM is not set + # CONFIG_VGASTATE is not set + CONFIG_VIDEO_OUTPUT_CONTROL=m +@@ -1271,6 +1294,7 @@ # CONFIG_SND_OXYGEN is not set # CONFIG_SND_CS4281 is not set # CONFIG_SND_CS46XX is not set @@ -369,7 +426,49 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # CONFIG_SND_CTXFI is not set # CONFIG_SND_DARLA20 is not set # CONFIG_SND_GINA20 is not set -@@ -1482,6 +1507,7 @@ +@@ -1321,6 +1345,7 @@ + CONFIG_SND_MIPS=y + CONFIG_SND_USB=y + # CONFIG_SND_USB_AUDIO is not set ++# CONFIG_SND_USB_UA101 is not set + # CONFIG_SND_USB_CAIAQ is not set + # CONFIG_SND_SOC is not set + # CONFIG_SOUND_PRIME is not set +@@ -1358,7 +1383,6 @@ + CONFIG_USB_DEVICEFS=y + # CONFIG_USB_DEVICE_CLASS is not set + # CONFIG_USB_DYNAMIC_MINORS is not set +-# CONFIG_USB_SUSPEND is not set + # CONFIG_USB_OTG is not set + CONFIG_USB_OTG_WHITELIST=y + # CONFIG_USB_OTG_BLACKLIST_HUB is not set +@@ -1440,7 +1464,6 @@ + # CONFIG_USB_RIO500 is not set + # CONFIG_USB_LEGOTOWER is not set + # CONFIG_USB_LCD is not set +-# CONFIG_USB_BERRY_CHARGE is not set + # CONFIG_USB_LED is not set + # CONFIG_USB_CYPRESS_CY7C63 is not set + # CONFIG_USB_CYTHERM is not set +@@ -1453,7 +1476,6 @@ + # CONFIG_USB_IOWARRIOR is not set + # CONFIG_USB_TEST is not set + CONFIG_USB_ISIGHTFW=m +-CONFIG_USB_VST=m + # CONFIG_USB_GADGET is not set + + # +@@ -1473,15 +1495,16 @@ + CONFIG_UIO_CIF=m + # CONFIG_UIO_PDRV is not set + # CONFIG_UIO_PDRV_GENIRQ is not set +-# CONFIG_UIO_SMX is not set + # CONFIG_UIO_AEC is not set + # CONFIG_UIO_SERCOS3 is not set + # CONFIG_UIO_PCI_GENERIC is not set ++# CONFIG_UIO_NETX is not set + + # # TI VLYNQ # # CONFIG_STAGING is not set @@ -377,7 +476,17 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # # File systems -@@ -1522,8 +1548,8 @@ +@@ -1499,9 +1522,7 @@ + # CONFIG_EXT4_DEBUG is not set + CONFIG_FS_XIP=y + CONFIG_JBD=y +-# CONFIG_JBD_DEBUG is not set + CONFIG_JBD2=m +-# CONFIG_JBD2_DEBUG is not set + CONFIG_FS_MBCACHE=m + CONFIG_REISERFS_FS=m + # CONFIG_REISERFS_CHECK is not set +@@ -1522,8 +1543,8 @@ # CONFIG_QUOTA is not set CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y @@ -388,27 +497,55 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m # # Caches -@@ -1700,6 +1726,11 @@ +@@ -1572,6 +1593,7 @@ + # CONFIG_BFS_FS is not set + # CONFIG_EFS_FS is not set + # CONFIG_JFFS2_FS is not set ++# CONFIG_LOGFS is not set + # CONFIG_CRAMFS is not set + # CONFIG_SQUASHFS is not set + # CONFIG_VXFS_FS is not set +@@ -1605,6 +1627,7 @@ + CONFIG_SMB_FS=m + CONFIG_SMB_NLS_DEFAULT=y + CONFIG_SMB_NLS_REMOTE="cp936" ++# CONFIG_CEPH_FS is not set + CONFIG_CIFS=m + CONFIG_CIFS_STATS=y + CONFIG_CIFS_STATS2=y +@@ -1692,24 +1715,24 @@ + # CONFIG_MAGIC_SYSRQ is not set + # CONFIG_STRIP_ASM_SYMS is not set + # CONFIG_UNUSED_SYMBOLS is not set +-CONFIG_DEBUG_FS=y ++# CONFIG_DEBUG_FS is not set + # CONFIG_HEADERS_CHECK is not set + # CONFIG_DEBUG_KERNEL is not set +-CONFIG_STACKTRACE=y + # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set CONFIG_SYSCTL_SYSCALL_CHECK=y - CONFIG_NOP_TRACER=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_EVENT_TRACING=y +-CONFIG_CONTEXT_SWITCH_TRACER=y + CONFIG_RING_BUFFER_ALLOW_SWAP=y +-CONFIG_TRACING=y + CONFIG_TRACING_SUPPORT=y + # CONFIG_FTRACE is not set +-# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y -+CONFIG_EARLY_PRINTK=y ++# CONFIG_EARLY_PRINTK is not set # CONFIG_CMDLINE_BOOL is not set # -@@ -1718,7 +1750,11 @@ +@@ -1718,7 +1741,11 @@ # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set @@ -421,145 +558,78 @@ diff -Nur linux-2.6.33/arch/mips/configs/fuloong2e_defconfig linux-lemote/arch/m 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 +@@ -1819,7 +1846,7 @@ + # + CONFIG_CRYPTO_ANSI_CPRNG=m + # CONFIG_CRYPTO_HW is not set +-CONFIG_BINARY_PRINTF=y ++# CONFIG_BINARY_PRINTF is not set + + # + # Library routines +diff -Nur linux-2.6.34.orig/arch/mips/configs/lemote2f_defconfig linux-loongson/arch/mips/configs/lemote2f_defconfig +--- linux-2.6.34.orig/arch/mips/configs/lemote2f_defconfig 2010-05-16 23:17:36.000000000 +0200 ++++ linux-loongson/arch/mips/configs/lemote2f_defconfig 2010-05-27 18:12:28.612213391 +0200 @@ -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 +-# Linux kernel version: 2.6.33-rc2 +-# Mon Jan 4 13:41:09 2010 ++# Linux kernel version: 2.6.34-rc3 ++# Sun Apr 11 04:31:19 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 +@@ -68,7 +68,7 @@ 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_DMA_NEED_PCI_MAP_STATE=y ++CONFIG_NEED_DMA_MAP_STATE=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 @@ +@@ -132,6 +132,7 @@ + CONFIG_MIPS_MT_DISABLED=y + # CONFIG_MIPS_MT_SMP is not set + # CONFIG_MIPS_MT_SMTC is not set ++# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set + CONFIG_CPU_HAS_WB=y + CONFIG_CPU_HAS_SYNC=y + CONFIG_GENERIC_HARDIRQS=y +@@ -188,9 +189,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_GZIP=y # CONFIG_KERNEL_BZIP2 is not set --CONFIG_KERNEL_LZMA=y -+# CONFIG_KERNEL_LZMA 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 -@@ -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 @@ +@@ -213,10 +216,8 @@ + CONFIG_IKCONFIG=y + CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=15 - # CONFIG_GROUP_SCHED is not set +-# 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_BLK_DEV_INITRD=y +@@ -224,6 +225,7 @@ + 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 @@ +@@ -250,13 +252,12 @@ # CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y @@ -569,520 +639,167 @@ diff -Nur linux-2.6.33/arch/mips/configs/lemote2f_defconfig linux-lemote/arch/mi # 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_PROFILING=y +-CONFIG_TRACEPOINTS=y + CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_SYSCALL_WRAPPERS=y - +@@ -264,11 +265,8 @@ # # 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_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 |