From 005d04baeff2ead5bf67ada5b9a97c1614f08872 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 16 May 2012 10:44:49 +0000 Subject: [PATCH] x86: sync 2.6.39 configs git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31749 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/x86/config-default | 1 - target/linux/x86/ep80579/config-default | 11 ++--- target/linux/x86/kvm_guest/config-default | 41 ++++++++++++++--- target/linux/x86/olpc/config-default | 76 +++++++++++-------------------- target/linux/x86/thincan/config-default | 35 +++++--------- target/linux/x86/xen_domu/config-default | 46 +++++++++++-------- 6 files changed, 104 insertions(+), 106 deletions(-) diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default index 38e2c22bae..43c72d5149 100644 --- a/target/linux/x86/config-default +++ b/target/linux/x86/config-default @@ -65,7 +65,6 @@ CONFIG_CRC16=y # CONFIG_DCDBAS is not set CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_PERF_USE_VMALLOC is not set CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_LZMA=y diff --git a/target/linux/x86/ep80579/config-default b/target/linux/x86/ep80579/config-default index 2a89b4fe6f..78ee0ce730 100644 --- a/target/linux/x86/ep80579/config-default +++ b/target/linux/x86/ep80579/config-default @@ -1,12 +1,11 @@ -CONFIG_ATA=y -CONFIG_BLK_DEV_SD=y -# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_HIGHMEM=y CONFIG_HIGHMEM4G=y # CONFIG_HIGHPTE is not set +# CONFIG_ITCO_VENDOR_SUPPORT is not set +CONFIG_ITCO_WDT=y +CONFIG_LOG_BUF_SHIFT=17 # CONFIG_MTD is not set # CONFIG_NOHIGHMEM is not set CONFIG_SATA_AHCI=y # CONFIG_SQUASHFS is not set -CONFIG_ITCO_WDT=y -# CONFIG_ITCO_VENDOR_SUPPORT is not set -CONFIG_LOG_BUF_SHIFT=17 diff --git a/target/linux/x86/kvm_guest/config-default b/target/linux/x86/kvm_guest/config-default index 655d18ca6a..6597ab8fe3 100644 --- a/target/linux/x86/kvm_guest/config-default +++ b/target/linux/x86/kvm_guest/config-default @@ -1,50 +1,77 @@ CONFIG_ACPI=y -# CONFIG_ACPI_PROC_EVENT 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=y +# CONFIG_ACPI_CMPC is not set # CONFIG_ACPI_CONTAINER is not set # CONFIG_ACPI_CUSTOM_DSDT is not set # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_DOCK is not set +# CONFIG_ACPI_EC_DEBUGFS is not set # CONFIG_ACPI_FAN is not set -CONFIG_ACPI_HOTPLUG_CPU=y # CONFIG_ACPI_PCI_SLOT is not set CONFIG_ACPI_PROCESSOR=y # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set # CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set +# CONFIG_ACPI_PROC_EVENT is not set +# CONFIG_ACPI_QUICKSTART is not set # CONFIG_ACPI_SBS is not set -CONFIG_ACPI_SYSFS_POWER=y -# CONFIG_ACPI_TOSHIBA is not set # CONFIG_ACPI_THERMAL is not set # CONFIG_ACPI_WMI is not set +# CONFIG_ASUS_LAPTOP is not set +CONFIG_CONSOLE_TRANSLATIONS=y +# CONFIG_DMAR is not set +CONFIG_DUMMY_CONSOLE=y +# CONFIG_EFI is not set +# CONFIG_HPET is not set +# CONFIG_HP_ACCEL is not set +CONFIG_HVC_DRIVER=y +CONFIG_HW_CONSOLE=y # CONFIG_HW_RANDOM_VIRTIO is not set CONFIG_INPUT=y CONFIG_INPUT_KEYBOARD=y +# CONFIG_INTEL_IPS is not set # CONFIG_KVM is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y # CONFIG_LGUEST is not set # CONFIG_LGUEST_GUEST is not set -# CONFIG_MICROCODE is not set +CONFIG_NLS=y CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_CLOCK=y CONFIG_PARAVIRT_GUEST=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PNP=y CONFIG_PNPACPI=y +CONFIG_PNP_DEBUG_MESSAGES=y +CONFIG_SERIAL_8250_PNP=y # CONFIG_THINKPAD_ACPI is not set +# CONFIG_TOPSTAR_LAPTOP is not set +# CONFIG_TOSHIBA_BT_RFKILL is not set +# CONFIG_VGACON_SOFT_SCROLLBACK is not set +CONFIG_VGA_CONSOLE=y +# CONFIG_VHOST_NET is not set CONFIG_VIRTIO=y # CONFIG_VIRTIO_BALLOON is not set CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_CONSOLE=y # CONFIG_VIRTIO_NET is not set CONFIG_VIRTIO_PCI=y -# CONFIG_VIRTIO_RANDOM is not set CONFIG_VIRTIO_RING=y CONFIG_VIRTUALIZATION=y -# CONFIG_VMI is not set CONFIG_VT=y CONFIG_VT_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_X86_ACPI_CPUFREQ is not set +# CONFIG_X86_LONGHAUL is not set # CONFIG_X86_PAT is not set +# CONFIG_X86_PCC_CPUFREQ is not set +CONFIG_X86_PM_TIMER=y +# CONFIG_X86_POWERNOW_K8 is not set +# CONFIG_XEN_PRIVILEGED_GUEST is not set +# CONFIG_XO15_EBOOK is not set diff --git a/target/linux/x86/olpc/config-default b/target/linux/x86/olpc/config-default index 084d9df33c..7529ac6f31 100644 --- a/target/linux/x86/olpc/config-default +++ b/target/linux/x86/olpc/config-default @@ -1,16 +1,7 @@ -# CONFIG_ACER_WMI is not set -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_FAN=y -CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_PROC_EVENT=y -CONFIG_ACPI_SLEEP=y # CONFIG_APM is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y CONFIG_BACKLIGHT_LCD_SUPPORT=y -# CONFIG_BACKLIGHT_MBP_NVIDIA is not set # CONFIG_BACKLIGHT_PROGEAR is not set # CONFIG_BACKLIGHT_SAHARA is not set CONFIG_BATTERY_OLPC=y @@ -19,27 +10,20 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SR_VENDOR=y # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_CAN_PM_TRACE=y CONFIG_CHR_DEV_SG=y -# CONFIG_COMPAL_LAPTOP is not set # CONFIG_CPA_DEBUG is not set # CONFIG_CPU_FREQ_STAT_DETAILS is not set CONFIG_CPU_IDLE_GOV_MENU=y # CONFIG_DEBUG_BOOT_PARAMS is not set -CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_NX_TEST is not set -# CONFIG_DEBUG_PAGEALLOC is not set -# CONFIG_DEBUG_RODATA is not set -# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_DEBUG_VIRTUAL is not set CONFIG_DECOMPRESS_LZO=y CONFIG_DETECT_HUNG_TASK=y -CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DISPLAY_SUPPORT=y -CONFIG_DMIID=y # CONFIG_EMBEDDED is not set CONFIG_FB=y CONFIG_FB_CFB_COPYAREA=y @@ -49,66 +33,61 @@ CONFIG_FB_GEODE=y # CONFIG_FB_GEODE_GX is not set # CONFIG_FB_GEODE_GX1 is not set CONFIG_FB_GEODE_LX=y +# CONFIG_FB_OLPC_DCON is not set +# CONFIG_FB_SM7XX is not set # CONFIG_FB_VESA is not set +# CONFIG_FB_WMT_GE_ROPS is not set +# CONFIG_FB_XGI is not set # CONFIG_FIRMWARE_EDID is not set -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FREEZER=y -# CONFIG_FUJITSU_LAPTOP is not set -CONFIG_GEODE_MFGPT_TIMER=y +CONFIG_GENERIC_GPIO=y +CONFIG_GPIOLIB=y # CONFIG_HAMRADIO is not set -CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HIBERNATE_CALLBACKS=y CONFIG_HIBERNATION=y -CONFIG_HIBERNATION_NVS=y -# CONFIG_HPET is not set -CONFIG_INPUT_EVDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900 -# CONFIG_ISA is not set -# CONFIG_KALLSYMS_ALL is not set +# CONFIG_HIGHMEM64G is not set # CONFIG_KEXEC_JUMP is not set CONFIG_LCD_CLASS_DEVICE=y -# CONFIG_LCD_ILI9320 is not set # CONFIG_LCD_PLATFORM is not set +CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y # CONFIG_M486 is not set # CONFIG_MATH_EMULATION is not set CONFIG_MGEODE_LX=y -# CONFIG_MICROCODE is not set # CONFIG_MISC_DEVICES is not set CONFIG_MMC=y -# CONFIG_MMC_AT91 is not set -# CONFIG_MMC_ATMELMCI is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y +# CONFIG_MMC_SDHCI_OF is not set # CONFIG_MMC_SDHCI_PCI is not set # CONFIG_MMC_SDHCI_PLTFM is not set # CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_WBSD is not set -CONFIG_MOUSE_PS2_OLPC=y -# CONFIG_MSI_LAPTOP is not set CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_OF_PARTS=y # CONFIG_MTRR is not set # CONFIG_NETDEV_1000 is not set # CONFIG_NETWORK_FILESYSTEMS is not set # CONFIG_NET_ETHERNET is not set CONFIG_NLS=y CONFIG_NO_HZ=y +CONFIG_OF=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_DEVICE=y +CONFIG_OF_GPIO=y +CONFIG_OF_IRQ=y +CONFIG_OF_NET=y +CONFIG_OF_PCI=y CONFIG_OLPC=y CONFIG_OPROFILE=y # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set -# CONFIG_PANASONIC_LAPTOP is not set # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCI_GOANY is not set CONFIG_PCI_GOOLPC=y CONFIG_PCI_OLPC=y -# CONFIG_PCIEPORTBUS is not set CONFIG_PERF_COUNTERS=y +CONFIG_PM=y +# CONFIG_PM_ADVANCED_DEBUG is not set CONFIG_PM_DEBUG=y CONFIG_PM_SLEEP=y CONFIG_PM_STD_PARTITION="" @@ -116,6 +95,7 @@ CONFIG_PM_STD_PARTITION="" # CONFIG_PM_VERBOSE is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PROC_DEVICETREE is not set CONFIG_PROFILING=y CONFIG_RD_LZO=y CONFIG_RELAY=y @@ -124,6 +104,7 @@ CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_DEBUG=y # CONFIG_SCx200 is not set +# CONFIG_SERIAL_OF_PLATFORM is not set CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_TIMER_STATS=y @@ -134,23 +115,18 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_USB_SUSPEND=y CONFIG_USB_UHCI_HCD=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_WATCHDOG is not set +CONFIG_X86_CMOV=y CONFIG_X86_DEBUGCTLMSR=y -# CONFIG_X86_DS is not set # CONFIG_X86_ELAN is not set CONFIG_X86_EXTENDED_PLATFORM=y -CONFIG_X86_L1_CACHE_SHIFT=5 # CONFIG_X86_MCE is not set -# CONFIG_X86_MRST is not set # CONFIG_X86_PTDUMP is not set # CONFIG_X86_RDC321X is not set # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set -# CONFIG_X86_RESERVE_LOW_64K is not set CONFIG_X86_TSC=y CONFIG_X86_USE_3DNOW=y CONFIG_X86_USE_PPRO_CHECKSUM=y diff --git a/target/linux/x86/thincan/config-default b/target/linux/x86/thincan/config-default index ce04ea29b9..405c65b5fc 100644 --- a/target/linux/x86/thincan/config-default +++ b/target/linux/x86/thincan/config-default @@ -1,26 +1,15 @@ - -# Fix freeze-on-boot issue -CONFIG_EMBEDDED=n - -# Enable in-kernel NFS client -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=y -CONFIG_NFS_V3=y -CONFIG_ROOT_NFS=y - -# Enable NBD -CONFIG_BLK_DEV_NBD=y - -# Enable Realtek 8139 CONFIG_8139TOO=y -CONFIG_8139TOO_PIO=n -CONFIG_8139TOO_TUNE_TWISTER=n -CONFIG_8139TOO_8129=n -CONFIG_8139_OLD_RX_RESET=n - -# Enable in-kernel IP autoconfiguration +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_BLK_DEV_NBD=y +# CONFIG_EMBEDDED is not set CONFIG_IP_PNP=y +# CONFIG_IP_PNP_BOOTP is not set CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=n -CONFIG_IP_PNP_RARP=n - +# CONFIG_IP_PNP_RARP is not set +CONFIG_LOCKD=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_SUNRPC=y diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default index a42c6f3823..cd885f3a6d 100644 --- a/target/linux/x86/xen_domu/config-default +++ b/target/linux/x86/xen_domu/config-default @@ -1,67 +1,75 @@ # CONFIG_APM is not set +CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=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_CPU_RMAP=y CONFIG_FREEZER=y CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HIBERNATE_CALLBACKS=y +# CONFIG_HIGHMEM64G is not set CONFIG_HOTPLUG_CPU=y CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_XEN=y -CONFIG_ISA_DMA_API=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_XZ is not set +CONFIG_IOMMU_HELPER=y # CONFIG_KVM_CLOCK is not set -# CONFIG_KVM_GUEST is not set # CONFIG_LGUEST_GUEST is not set -CONFIG_LOCK_KERNEL=y # CONFIG_M486 is not set +CONFIG_MMU_NOTIFIER=y CONFIG_MPENTIUM4=y +CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NR_CPUS=4 CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_SPINLOCKS=y +CONFIG_PCI_XEN=y CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y +CONFIG_RFS_ACCEL=y +CONFIG_RPS=y CONFIG_SCHED_MC=y # CONFIG_SCHED_SMT is not set CONFIG_SMP=y CONFIG_SPARSE_IRQ=y CONFIG_STOP_MACHINE=y +CONFIG_SWIOTLB=y +CONFIG_SWIOTLB_XEN=y CONFIG_SYS_HYPERVISOR=y +CONFIG_TREE_RCU=y CONFIG_USE_GENERIC_SMP_HELPERS=y -# CONFIG_VMI is not set CONFIG_X86_32_SMP=y # CONFIG_X86_BIGSMP is not set CONFIG_X86_CMOV=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_DEBUGCTLMSR=y -# CONFIG_X86_DS is not set CONFIG_X86_HT=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=7 CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_PAE=y -CONFIG_X86_TRAMPOLINE=y CONFIG_X86_TSC=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_XEN=y # CONFIG_XENFS is not set CONFIG_XEN_BALLOON=y CONFIG_XEN_BLKDEV_FRONTEND=y +# CONFIG_XEN_DEBUG is not set CONFIG_XEN_DEBUG_FS=y # CONFIG_XEN_DEV_EVTCHN is not set -CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_XEN_MAX_DOMAIN_MEMORY=128 # CONFIG_XEN_NETDEV_FRONTEND is not set +CONFIG_XEN_PCIDEV_FRONTEND=y +CONFIG_XEN_PLATFORM_PCI=m +# CONFIG_XEN_PRIVILEGED_GUEST is not set +CONFIG_XEN_PVHVM=y CONFIG_XEN_SAVE_RESTORE=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SYS_HYPERVISOR=y +# CONFIG_XEN_WDT is not set +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XPS=y -- 2.11.0