From 81c56d1c52ca10c9ca075ea56547d9af92ad8dbb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 13 Feb 2010 20:15:05 +0000 Subject: [PATCH] move kernel config symbols from the Xen subtarget to the platform config SVN-Revision: 19625 --- target/linux/x86/config-2.6.32 | 72 ++++++++++++++++++++++--- target/linux/x86/xen_domu/config-2.6.32 | 37 +------------ 2 files changed, 65 insertions(+), 44 deletions(-) diff --git a/target/linux/x86/config-2.6.32 b/target/linux/x86/config-2.6.32 index 398c0668e0..e05e9f798f 100644 --- a/target/linux/x86/config-2.6.32 +++ b/target/linux/x86/config-2.6.32 @@ -22,6 +22,7 @@ # CONFIG_ACQUIRE_WDT is not set # CONFIG_ADVANTECH_WDT is not set # CONFIG_ALIM1535_WDT is not set +# CONFIG_APM is not set # CONFIG_APRICOT is not set # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set # CONFIG_ASUS_LAPTOP is not set @@ -59,17 +60,23 @@ # CONFIG_ELPLUS is not set # CONFIG_EUROTECH_WDT is not set # CONFIG_FRAME_POINTER is not set +# CONFIG_FREEZER is not # CONFIG_GENERIC_CPU is not set +# CONFIG_GENERIC_PENDING_IRQ is not set # CONFIG_GENERIC_TIME_VSYSCALL is not set # CONFIG_HANGCHECK_TIMER is not set # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set +# CONFIG_HAVE_PERF_EVENTS is not set # CONFIG_HIBERNATION is not set # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set # CONFIG_HIGH_RES_TIMERS is not set -# CONFIG_HPET_TIMER is not set +# CONFIG_HOTPLUG_CPU is not set # CONFIG_HP_WATCHDOG is not set # CONFIG_HUGETLBFS is not set +# CONFIG_HVC_DRIVER is not set +# CONFIG_HVC_IRQ is not set +# CONFIG_HVC_XEN is not set # CONFIG_I6300ESB_WDT is not set # CONFIG_I8K is not set # CONFIG_IB700_WDT is not set @@ -92,9 +99,14 @@ # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KVM_CLOCK is not set +# CONFIG_KVM_GUEST is not set # CONFIG_LANCE is not set # CONFIG_LEDS_ALIX2 is not set # CONFIG_LEDS_CLEVO_MAIL is not set +# CONFIG_LGUEST_GUEST is not set +# CONFIG_LOCK_KERNEL is not set +# CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586MMX is not set @@ -137,10 +149,14 @@ # CONFIG_NET_NS is not set # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_VENDOR_SMC is not set +# CONFIG_NR_CPUS is not set # CONFIG_NSC_GPIO is not set # CONFIG_OLPC is not set # CONFIG_OPTIMIZE_INLINING is not set +# CONFIG_PARAVIRT is not set +# CONFIG_PARAVIRT_CLOCK is not set # CONFIG_PARAVIRT_GUEST is not set +# CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_PC87413_WDT is not set # CONFIG_PCIEPORTBUS is not set @@ -150,20 +166,27 @@ # CONFIG_PCI_GOOLPC is not set # CONFIG_PCWATCHDOG is not set # CONFIG_PDA_POWER is not set +# CONFIG_PERF_COUNTERS is not set +# CONFIG_PERF_EVENTS is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set # CONFIG_PM_DEBUG is not set # CONFIG_PM_RUNTIME is not set +# CONFIG_PM_SLEEP is not set +# CONFIG_PM_SLEEP_SMP is not set # CONFIG_PNPBIOS is not set # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PROCESSOR_SELECT is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_RELOCATABLE is not set -# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +# CONFIG_RWSEM_GENERIC_SPINLOCK 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_MC is not set +# CONFIG_SCHED_SMT is not set # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCx200_GPIO is not set # CONFIG_SCx200_WDT is not set @@ -174,10 +197,13 @@ # CONFIG_SLAB is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set +# CONFIG_SMP is not set # CONFIG_SMSC37B787_WDT is not set # CONFIG_SMSC_SCH311X_WDT is not set # CONFIG_SPARSE_IRQ is not set +# CONFIG_STOP_MACHINE is not set # CONFIG_SUSPEND is not set +# CONFIG_SYS_HYPERVISOR is not set # CONFIG_TC1100_WMI is not set # CONFIG_TELCLOCK is not set # CONFIG_THINKPAD_ACPI is not set @@ -186,22 +212,31 @@ # CONFIG_TREE_PREEMPT_RCU is not set # CONFIG_TYPHOON is not set # CONFIG_USER_NS is not set +# CONFIG_USE_GENERIC_SMP_HELPERS is not set # CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_VMI is not set # CONFIG_VORTEX is not set # CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_W83697UG_WDT is not set # CONFIG_WAFER_WDT is not set # CONFIG_WDT is not set +# CONFIG_X86_32_SMP is not set # CONFIG_X86_64 is not set # CONFIG_X86_ACPI_CPUFREQ is not set # CONFIG_X86_ANCIENT_MCE is not set +# CONFIG_X86_BIGSMP is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -# CONFIG_X86_CMPXCHG is not set +# CONFIG_X86_CMOV is not set +# CONFIG_X86_CMPXCHG64 is not set # CONFIG_X86_CPUFREQ_NFORCE2 is not set # CONFIG_X86_CPUID is not set +# CONFIG_X86_DEBUGCTLMSR is not set +# CONFIG_X86_DS is not set # CONFIG_X86_ELAN is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_E_POWERSAVER is not set # CONFIG_X86_GX_SUSPMOD is not set +# CONFIG_X86_HT is not set # CONFIG_X86_LONGHAUL is not set # CONFIG_X86_LONGRUN is not set # CONFIG_X86_MCE_INJECT is not set @@ -218,6 +253,20 @@ # CONFIG_X86_SPEEDSTEP_ICH is not set # CONFIG_X86_SPEEDSTEP_LIB is not set # CONFIG_X86_SPEEDSTEP_SMI is not set +# CONFIG_X86_TRAMPOLINE is not set +# CONFIG_X86_TSC is not set +# CONFIG_X86_USE_PPRO_CHECKSUM is not set +# CONFIG_XEN is not set +# CONFIG_XENFS is not set +# CONFIG_XEN_BALLOON is not set +# CONFIG_XEN_BLKDEV_FRONTEND is not set +# CONFIG_XEN_DEBUG_FS is not set +# CONFIG_XEN_DEV_EVTCHN is not set +# CONFIG_XEN_MAX_DOMAIN_MEMORY is not set +# CONFIG_XEN_NETDEV_FRONTEND is not set +# CONFIG_XEN_SAVE_RESTORE is not set +# CONFIG_XEN_SCRUB_PAGES is not set +# CONFIG_XEN_SYS_HYPERVISOR is not set # CONFIG_ZONE_DMA32 is not set CONFIG_4KSTACKS=y CONFIG_ACPI=y @@ -331,7 +380,9 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_HID=y CONFIG_HID_SUPPORT=y CONFIG_HPET=y +CONFIG_HPET_EMULATE_RTC=y CONFIG_HPET_MMAP=y +CONFIG_HPET_TIMER=y CONFIG_HT_IRQ=y CONFIG_HW_CONSOLE=y CONFIG_HW_RANDOM=y @@ -357,7 +408,6 @@ CONFIG_KALLSYMS=y CONFIG_KEXEC=y CONFIG_KEYBOARD_ATKBD=y CONFIG_KTIME_SCALAR=y -CONFIG_M386=y CONFIG_MATH_EMULATION=y CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y @@ -373,9 +423,9 @@ CONFIG_MTRR=y CONFIG_NAMESPACES=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y +CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NET_VENDOR_3COM=y CONFIG_NOHIGHMEM=y -CONFIG_NR_CPUS=1 CONFIG_NVRAM=y CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PAGEFLAGS_EXTENDED=y @@ -403,6 +453,7 @@ CONFIG_PROC_PAGE_MONITOR=y CONFIG_RD_BZIP2=y CONFIG_RD_GZIP=y CONFIG_RTC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SCSI=y CONFIG_SCx200=y @@ -430,25 +481,28 @@ CONFIG_VT_CONSOLE=y CONFIG_X86=y CONFIG_X86_32=y CONFIG_X86_32_LAZY_GS=y +CONFIG_X86_BSWAP=y +CONFIG_X86_CMPXCHG=y CONFIG_X86_CPU=y -CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_F00F_BUG=y CONFIG_X86_GENERIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_INTERNODE_CACHE_BYTES=64 +CONFIG_X86_INVLPG=y CONFIG_X86_IO_APIC=y CONFIG_X86_L1_CACHE_BYTES=64 -CONFIG_X86_L1_CACHE_SHIFT=4 +CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_LOCAL_APIC=y CONFIG_X86_MCE=y CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_INTEL=y CONFIG_X86_MCE_THRESHOLD=y -CONFIG_X86_MINIMUM_CPU_FAMILY=3 +CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_X86_MPPARSE=y CONFIG_X86_PAT=y CONFIG_X86_PLATFORM_DEVICES=y CONFIG_X86_PM_TIMER=y +CONFIG_X86_POPAD_OK=y CONFIG_X86_PPRO_FENCE=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_RESERVE_LOW_64K=y @@ -457,3 +511,5 @@ CONFIG_X86_THERMAL_VECTOR=y CONFIG_X86_UP_APIC=y CONFIG_X86_UP_IOAPIC=y CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_XADD=y diff --git a/target/linux/x86/xen_domu/config-2.6.32 b/target/linux/x86/xen_domu/config-2.6.32 index 322d57269b..0e8a382f09 100644 --- a/target/linux/x86/xen_domu/config-2.6.32 +++ b/target/linux/x86/xen_domu/config-2.6.32 @@ -1,47 +1,18 @@ -# CONFIG_APM 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_PERF_EVENTS 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_FREEZER=y CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_HAVE_PERF_EVENTS=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_MPENTIUM4=y -CONFIG_NR_CPUS=2 +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_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SCHED_MC=y CONFIG_SMP=y CONFIG_SPARSE_IRQ=y @@ -49,22 +20,16 @@ CONFIG_STOP_MACHINE=y CONFIG_SYS_HYPERVISOR=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=5 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 -- 2.34.1