2 files changed, 32 insertions, 0 deletions

diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
index 6586cf09..88e20a3e 100644
--- a/conf/machine/include/qemuboot-intel.inc
+++ b/conf/machine/include/qemuboot-intel.inc
@@ -8,6 +8,10 @@ QB_SYSTEM_NAME_intel-corei7-64 = "qemu-system-x86_64"
 QB_CPU_intel-corei7-64 = "-cpu Nehalem"
 QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64"
 
+QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64"
+QB_CPU_intel-skylake-64 = "-cpu Skylake-Client"
+QB_CPU_KVM_intel-skylake-64 = "-cpu kvm64"
+
 QB_AUDIO_DRV = "alsa"
 QB_AUDIO_OPT = "-soundhw ac97,es1370"
 QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1"
diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc
new file mode 100644
index 00000000..78645def
--- /dev/null
+++ b/conf/machine/include/tune-skylake.inc
@@ -0,0 +1,28 @@
+# Settings for the GCC(1) cpu-type "skylake":
+#
+#     Intel Skylake CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1,
+#     SSE4.2, AVX, AVX2 and POPCNT instruction set support.
+#
+# This tune is recommended for Intel Skylake CPU (and beyond).
+#
+DEFAULTTUNE ?= "skylake-64"
+
+# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
+require conf/machine/include/tune-core2.inc
+
+# Extra tune features
+TUNEVALID[skylake] = "Enable skylake specific processor optimizations"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake -mtune=generic -mfpmath=sse -mavx2', '', d)}"
+
+# Extra tune selections
+
+AVAILTUNES += "skylake-64"
+TUNE_FEATURES_tune-skylake-64 = "${TUNE_FEATURES_tune-x86-64} skylake"
+BASE_LIB_tune-skylake-64 = "lib64"
+TUNE_PKGARCH_tune-skylake-64 = "skylake-64"
+PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} skylake-64"
+QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client"
+
+# Disable QEMU user
+MACHINE_FEATURES_remove = "qemu-usermode"
+