From 152396b9a2125104a604c9def182f32506d9cf8f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 19 Apr 2010 00:49:41 +0000 Subject: [PATCH] [backfire] merge r21010 SVN-Revision: 21011 --- target/linux/x86/xen_domu/config-default | 29 ++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/target/linux/x86/xen_domu/config-default b/target/linux/x86/xen_domu/config-default index c5f8ce1d2b..7e00fbe2f6 100644 --- a/target/linux/x86/xen_domu/config-default +++ b/target/linux/x86/xen_domu/config-default @@ -1,26 +1,47 @@ +# CONFIG_APM is not set 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_FREEZER=y CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HOTPLUG_CPU=y CONFIG_HVC_DRIVER=y CONFIG_HVC_IRQ=y CONFIG_HVC_XEN=y +CONFIG_ISA_DMA_API=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_MPENTIUM4=y CONFIG_NR_CPUS=4 +CONFIG_PARAVIRT=y CONFIG_PARAVIRT_CLOCK=y CONFIG_PARAVIRT_GUEST=y -CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_SPINLOCKS=y CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y CONFIG_SCHED_MC=y +# CONFIG_SCHED_SMT is not set CONFIG_SMP=y CONFIG_SPARSE_IRQ=y CONFIG_STOP_MACHINE=y CONFIG_SYS_HYPERVISOR=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_L1_CACHE_SHIFT=7 CONFIG_X86_MINIMUM_CPU_FAMILY=5 @@ -28,10 +49,14 @@ 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_FS=y +# CONFIG_XEN_DEV_EVTCHN is not set CONFIG_XEN_MAX_DOMAIN_MEMORY=8 +# CONFIG_XEN_NETDEV_FRONTEND is not set CONFIG_XEN_SAVE_RESTORE=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN=y -- 2.30.2