merge 2.6.31 and 2.6.32 configs

SVN-Revision: 19626

4 files changed, 18 insertions, 545 deletions

diff --git a/target/linux/x86/config-2.6.31 b/target/linux/x86/config-2.6.31
deleted file mode 100644
index 4e655e5255..0000000000
--- a/target/linux/x86/config-2.6.31
+++ /dev/null
@@ -1,460 +0,0 @@
-# CONFIG_3C515 is not set
-CONFIG_4KSTACKS=y
-# CONFIG_60XX_WDT is not set
-# CONFIG_64BIT is not set
-# CONFIG_AC3200 is not set
-# CONFIG_ACPI_AC is not set
-# CONFIG_ACPI_ASUS is not set
-# CONFIG_ACPI_BATTERY is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_BUTTON is not set
-# CONFIG_ACPI_CONTAINER is not set
-# CONFIG_ACPI_DEBUG is not set
-# CONFIG_ACPI_DOCK is not set
-# CONFIG_ACPI_FAN is not set
-# CONFIG_ACPI_PCI_SLOT is not set
-CONFIG_ACPI_PROCESSOR=y
-# CONFIG_ACPI_PROC_EVENT is not set
-# CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_SBS is not set
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_TOSHIBA is not set
-# CONFIG_ACPI_WMI is not set
-CONFIG_ACPI=y
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
-# CONFIG_ALIM1535_WDT is not set
-# CONFIG_APRICOT is not set
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_ASUS_LAPTOP is not set
-# CONFIG_AT1700 is not set
-CONFIG_ATA_GENERIC=y
-CONFIG_ATA_PIIX=y
-CONFIG_ATA=y
-# CONFIG_AUDIT_ARCH is not set
-# CONFIG_BINARY_PRINTF is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_SD=y
-# CONFIG_BLK_DEV_XD is not set
-CONFIG_BOUNCE=y
-# CONFIG_CC_STACKPROTECTOR is not set
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_COMPAT_VDSO=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_CONSTRUCTORS=y
-# CONFIG_CPU5_WDT is not set
-# CONFIG_CPU_FREQ_DEBUG is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-# CONFIG_CS5535_GPIO is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DCDBAS is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DELL_RBU is not set
-# CONFIG_DEPCA is not set
-CONFIG_DEVPORT=y
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_DMAR is not set
-# CONFIG_DMIID is not set
-CONFIG_DMI=y
-CONFIG_DNOTIFY=y
-CONFIG_DOUBLEFAULT=y
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EDD is not set
-# CONFIG_EEEPC_LAPTOP is not set
-# CONFIG_EFI is not set
-# CONFIG_EISA is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL1 is not set
-# CONFIG_EL2 is not set
-# CONFIG_EL3 is not set
-CONFIG_ELF_CORE=y
-# CONFIG_ELPLUS is not set
-# CONFIG_EUROTECH_WDT is not set
-CONFIG_EXT2_FS=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_FIX_EARLYCON_MEM=y
-# CONFIG_FRAME_POINTER is not set
-CONFIG_FSNOTIFY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-# CONFIG_GENERIC_CPU is not set
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
-# CONFIG_HANGCHECK_TIMER is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_AOUT=y
-CONFIG_HAVE_ARCH_KGDB=y
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
-CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FTRACE_SYSCALLS=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_HIBERNATION is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-CONFIG_HPET_MMAP=y
-# CONFIG_HPET_TIMER is not set
-CONFIG_HPET=y
-# CONFIG_HP_WATCHDOG is not set
-CONFIG_HT_IRQ=y
-# CONFIG_HUGETLBFS is not set
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM_AMD is not set
-CONFIG_HW_RANDOM_GEODE=y
-# CONFIG_HW_RANDOM_INTEL is not set
-CONFIG_HW_RANDOM_VIA=y
-CONFIG_HW_RANDOM=y
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_I8K is not set
-# CONFIG_IB700_WDT is not set
-# CONFIG_IBM_ASM is not set
-# CONFIG_IBMASR is not set
-# CONFIG_IMA is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT=y
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_INTEL_MENLOW is not set
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IOMMU_API is not set
-# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_ISA_DMA_API=y
-CONFIG_ISAPNP=y
-CONFIG_ISA=y
-# CONFIG_ISCSI_IBFT_FIND is not set
-# CONFIG_IT8712F_WDT is not set
-# CONFIG_IT87_WDT is not set
-# CONFIG_ITCO_WDT is not set
-CONFIG_KALLSYMS=y
-CONFIG_KEXEC=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KTIME_SCALAR=y
-# CONFIG_LANCE is not set
-# CONFIG_LEDS_ALIX2 is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
-CONFIG_M386=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M686 is not set
-CONFIG_MAC80211_DEFAULT_PS_VALUE=0
-# CONFIG_MACHZ_WDT is not set
-CONFIG_MATH_EMULATION=y
-# CONFIG_MCA is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MICROCODE_AMD is not set
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_MICROCODE=y
-# CONFIG_MIXCOMWD is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPSC is not set
-CONFIG_MTD_BLOCK2MTD=y
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
-# CONFIG_MTRR_SANITIZER is not set
-CONFIG_MTRR=y
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MWINCHIPC6 is not set
-CONFIG_NAMESPACES=y
-# CONFIG_NET_NS is not set
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NET_VENDOR_SMC is not set
-CONFIG_NOHIGHMEM=y
-CONFIG_NR_CPUS=1
-# CONFIG_NSC_GPIO is not set
-CONFIG_NVRAM=y
-# CONFIG_OLPC is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PARAVIRT_GUEST is not set
-CONFIG_PATA_AMD=y
-# CONFIG_PATA_CS5536 is not set
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_SC1200=y
-CONFIG_PATA_VIA=y
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_PC87413_WDT is not set
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCIEPORTBUS is not set
-CONFIG_PCI_GOANY=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_MSI=y
-CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_PCWATCHDOG is not set
-# CONFIG_PDA_POWER is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM=y
-# CONFIG_PNPACPI is not set
-# CONFIG_PNPBIOS is not set
-CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_PNP=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PROCESSOR_SELECT is not set
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-CONFIG_RD_BZIP2=y
-CONFIG_RD_GZIP=y
-# CONFIG_RELOCATABLE is not set
-CONFIG_RTC=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
-# CONFIG_SC1200_WDT is not set
-# CONFIG_SC520_WDT is not set
-# CONFIG_SCHED_HRTICK is not set
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_SCSI=y
-# CONFIG_SCx200_GPIO is not set
-CONFIG_SCx200HR_TIMER=y
-# CONFIG_SCx200_WDT is not set
-CONFIG_SCx200=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO=y
-# CONFIG_SLAB is not set
-# CONFIG_SLOW_WORK is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_STATS is not set
-CONFIG_SLUB=y
-# CONFIG_SMSC37B787_WDT is not set
-# CONFIG_SMSC_SCH311X_WDT is not set
-# CONFIG_SONYPI is not set
-# CONFIG_SPARSE_IRQ is not set
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_STRICT_DEVMEM=y
-# CONFIG_SUSPEND is not set
-# CONFIG_TC1100_WMI is not set
-# CONFIG_TELCLOCK is not set
-# CONFIG_THINKPAD_ACPI is not set
-# CONFIG_TOSHIBA is not set
-CONFIG_TRACING_SUPPORT=y
-# CONFIG_TYPHOON is not set
-CONFIG_UID16=y
-CONFIG_USB_SUPPORT=y
-# CONFIG_USER_NS is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-CONFIG_VGA_CONSOLE=y
-CONFIG_VM86=y
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VORTEX is not set
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-CONFIG_VT=y
-# CONFIG_W83697UG_WDT is not set
-# CONFIG_WAFER_WDT is not set
-# CONFIG_WDT is not set
-CONFIG_X86_32_LAZY_GS=y
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-# CONFIG_X86_ACPI_CPUFREQ is not set
-# CONFIG_X86_ANCIENT_MCE is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-# CONFIG_X86_CMPXCHG is not set
-# CONFIG_X86_CPU_DEBUG is not set
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_X86_CPUID is not set
-CONFIG_X86_CPU=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_E_POWERSAVER is not set
-CONFIG_X86_EXTENDED_PLATFORM=y
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_GENERIC=y
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_L1_CACHE_SHIFT=4
-CONFIG_X86_LOCAL_APIC=y
-# CONFIG_X86_LONGHAUL is not set
-# CONFIG_X86_LONGRUN is not set
-CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=3
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_MSR is not set
-CONFIG_X86_NEW_MCE=y
-# CONFIG_X86_OLD_MCE is not set
-# CONFIG_X86_P4_CLOCKMOD is not set
-# CONFIG_X86_PAE is not set
-CONFIG_X86_PAT=y
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_X86_PM_TIMER=y
-# CONFIG_X86_POWERNOW_K6 is not set
-# CONFIG_X86_POWERNOW_K7 is not set
-# CONFIG_X86_POWERNOW_K8 is not set
-CONFIG_X86_PPRO_FENCE=y
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_RESERVE_LOW_64K=y
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_SPEEDSTEP_ICH is not set
-# CONFIG_X86_SPEEDSTEP_LIB is not set
-# CONFIG_X86_SPEEDSTEP_SMI is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_X86=y
-# CONFIG_ZONE_DMA32 is not set
diff --git a/target/linux/x86/config-2.6.32 b/target/linux/x86/config-default
index e05e9f798f..e05e9f798f 100644
--- a/target/linux/x86/config-2.6.32
+++ b/target/linux/x86/config-default
diff --git a/target/linux/x86/xen_domu/config-2.6.31 b/target/linux/x86/xen_domu/config-2.6.31
deleted file mode 100644
index 3d24d1673b..0000000000
--- a/target/linux/x86/xen_domu/config-2.6.31
+++ /dev/null
@@ -1,84 +0,0 @@
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-# CONFIG_APM is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_KERNEL_LZMA is not set
-# CONFIG_KVM_CLOCK is not set
-# CONFIG_KVM_GUEST is not set
-# CONFIG_LGUEST_GUEST is not set
-# CONFIG_M386 is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-# CONFIG_PERF_COUNTERS is not set
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-# CONFIG_SCHED_SMT is not set
-# CONFIG_VMI is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_DS is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_PLATFORM_DEVICES is not set
-# CONFIG_XENFS is not set
-# CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEV_EVTCHN is not set
-# CONFIG_XEN_NETDEV_FRONTEND is not set
-CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_FREEZER=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_PERF_COUNTERS=y
-CONFIG_HOTPLUG_CPU=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_HPET_TIMER=y
-CONFIG_HVC_DRIVER=y
-CONFIG_HVC_IRQ=y
-CONFIG_HVC_XEN=y
-CONFIG_KERNEL_GZIP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_MARKERS=y
-CONFIG_MPENTIUM4=y
-CONFIG_NR_CPUS=2
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_CLOCK=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PNPACPI=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_SCHED_MC=y
-CONFIG_SMP=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_STOP_MACHINE=y
-CONFIG_SYS_HYPERVISOR=y
-CONFIG_THERMAL=y
-CONFIG_TRACEPOINTS=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_32_SMP=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_X86_HT=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
-CONFIG_X86_PAE=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_X86_TSC=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_XADD=y
-CONFIG_XEN=y
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
-CONFIG_XEN_SAVE_RESTORE=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_SYS_HYPERVISOR=y
diff --git a/target/linux/x86/xen_domu/config-2.6.32 b/target/linux/x86/xen_domu/config-default
index 0e8a382f09..992d39da66 100644
--- a/target/linux/x86/xen_domu/config-2.6.32
+++ b/target/linux/x86/xen_domu/config-default
@@ -1,18 +1,35 @@
+# CONFIG_CLASSIC_RCU is not set
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_X86_CPU_DEBUG is not set
+# CONFIG_X86_OLD_MCE is not set
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_FAST_CMPXCHG_LOCAL=y
 CONFIG_FREEZER=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
+CONFIG_HAVE_FTRACE_SYSCALLS=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_PERF_COUNTERS=y
+CONFIG_HOTPLUG_CPU=y
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_KERNEL_GZIP=y
 CONFIG_LOCK_KERNEL=y
+CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 CONFIG_MPENTIUM4=y
 CONFIG_NR_CPUS=4
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_RCU_FANOUT=32
 CONFIG_SCHED_MC=y
 CONFIG_SMP=y
 CONFIG_SPARSE_IRQ=y
@@ -25,7 +42,7 @@ CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_X86_HT=y
 CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_NEW_MCE=y
 CONFIG_X86_PAE=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_TSC=y