diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/Config.in | 1 | ||||
-rw-r--r-- | target/linux/Config.in | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.kvm | 46 | ||||
-rw-r--r-- | target/shuttle/device.mk | 2 | ||||
-rw-r--r-- | target/shuttle/kernel.config | 27 |
5 files changed, 63 insertions, 14 deletions
diff --git a/target/Config.in b/target/Config.in index 7f6f6da40..8fa9731df 100644 --- a/target/Config.in +++ b/target/Config.in @@ -212,7 +212,6 @@ config ADK_LINUX_X86_64_SHUTTLE select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE - select ADK_KPACKAGE_KMOD_SKY2 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK select ADK_KPACKAGE_KMOD_SATA_AHCI if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK select ADK_KPACKAGE_KMOD_BLK_DEV_MD if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK select ADK_KPACKAGE_KMOD_MD_RAID0 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK diff --git a/target/linux/Config.in b/target/linux/Config.in index 6adedfd78..8ab0678a7 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -13,4 +13,5 @@ source target/linux/config/Config.in.bluetooth source target/linux/config/Config.in.isdn source target/linux/config/Config.in.misc source target/linux/config/Config.in.lib +source target/linux/config/Config.in.kvm source target/linux/config/Config.in.debug diff --git a/target/linux/config/Config.in.kvm b/target/linux/config/Config.in.kvm new file mode 100644 index 000000000..4fc515e0e --- /dev/null +++ b/target/linux/config/Config.in.kvm @@ -0,0 +1,46 @@ +menu "Virtualization" +depends on ADK_LINUX_X86_64_SHUTTLE + +config ADK_KERNEL_VIRTUALIZATION + bool + default n + +config ADK_KERNEL_KVM + bool + default n + +config ADK_KPACKAGE_KMOD_KVM + prompt "kmod-kvm.......................... Kernel-based Virtual Machine (KVM) support" + tristate + depends on !ADK_KERNEL_KVM + select ADK_KERNEL_VIRTUALIZATION + default n + help + Support hosting fully virtualized guest machines using hardware + virtualization extensions. You will need a fairly recent + processor equipped with virtualization extensions. You will also + need to select one or more of the processor modules below. + This module provides access to the hardware capabilities through + a character device node named /dev/kvm. + +config ADK_KPACKAGE_KMOD_KVM_AMD + prompt "kmod-kvm-amd...................... KVM for AMD processors support" + tristate + depends on !ADK_KERNEL_KVM + select ADK_KERNEL_VIRTUALIZATION + default n + help + Provides support for KVM on AMD processors equipped with the AMD-V + (SVM) extensions. + +config ADK_KPACKAGE_KMOD_KVM_INTEL + prompt "kmod-kvm-intel.................... KVM for Intel processors support" + tristate + depends on !ADK_KERNEL_KVM + select ADK_KERNEL_VIRTUALIZATION + default n + help + Provides support for KVM on Intel processors equipped with the VT + extensions. + +endmenu diff --git a/target/shuttle/device.mk b/target/shuttle/device.mk index 3241868c7..f9c6224ae 100644 --- a/target/shuttle/device.mk +++ b/target/shuttle/device.mk @@ -4,4 +4,4 @@ KERNEL_VERSION:= 2.6.30.5 KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= be9c3a697a54ac099c910d068ff0dc03 TARGET_OPTIMIZATION:= -O2 -pipe -TARGET_CFLAGS_ARCH:= +TARGET_CFLAGS_ARCH:= -march=amdfam10 diff --git a/target/shuttle/kernel.config b/target/shuttle/kernel.config index fa7bc84d5..4a9b9ab0a 100644 --- a/target/shuttle/kernel.config +++ b/target/shuttle/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30.5 -# Tue Sep 1 19:09:13 2009 +# Fri Sep 11 11:48:18 2009 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -169,13 +169,12 @@ CONFIG_DEFAULT_IOSCHED="noop" # CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y -# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y # CONFIG_SPARSE_IRQ is not set CONFIG_X86_MPPARSE=y -CONFIG_X86_EXTENDED_PLATFORM=y -# CONFIG_X86_VSMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_PARAVIRT_GUEST is not set # CONFIG_MEMTEST is not set @@ -191,7 +190,7 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_MPENTIUM4 is not set # CONFIG_MK6 is not set # CONFIG_MK7 is not set -# CONFIG_MK8 is not set +CONFIG_MK8=y # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set @@ -203,22 +202,24 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y # CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set -CONFIG_GENERIC_CPU=y +# CONFIG_GENERIC_CPU is not set CONFIG_X86_CPU=y CONFIG_X86_L1_CACHE_BYTES=64 CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_TSC=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMOV=y CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_DEBUGCTLMSR=y -# CONFIG_PROCESSOR_SELECT is not set -CONFIG_CPU_SUP_INTEL=y +CONFIG_PROCESSOR_SELECT=y +# CONFIG_CPU_SUP_INTEL is not set CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y +# CONFIG_CPU_SUP_CENTAUR is not set # CONFIG_X86_DS is not set CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y @@ -238,7 +239,7 @@ CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y CONFIG_X86_MCE=y -CONFIG_X86_MCE_INTEL=y +# CONFIG_X86_MCE_INTEL is not set CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_I8K is not set @@ -274,7 +275,9 @@ CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW_64K=y -# CONFIG_MTRR is not set +CONFIG_MTRR=y +# CONFIG_MTRR_SANITIZER is not set +CONFIG_X86_PAT=y # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set @@ -282,7 +285,7 @@ CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_SCHED_HRTICK is not set +CONFIG_SCHED_HRTICK=y # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x200000 |