3 files changed, 2 insertions, 26 deletions

diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc
deleted file mode 100644
index b6e5527f..00000000
--- a/conf/machine/include/tune-skylake.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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/x86/tune-corei7.inc
-
-# Extra tune features
-TUNEVALID[skylake] = "Enable skylake specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake -mtune=generic -mavx2 -mfpmath=sse', '', 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"
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
index 47d53fa0..a2b392c2 100644
--- a/conf/machine/intel-skylake-64.conf
+++ b/conf/machine/intel-skylake-64.conf
@@ -5,7 +5,7 @@
 
 require conf/machine/include/meta-intel.inc
 require conf/machine/include/x86/x86-base.inc
-require conf/machine/include/tune-skylake.inc
+require conf/machine/include/x86/tune-x86-64-v3.inc
 require conf/machine/include/intel-common-pkgarch.inc
 
 MACHINE_FEATURES += "efi"
diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc
index 41582aa5..0c861e13 100644
--- a/recipes-kernel/linux/meta-intel-compat-kernel.inc
+++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc
@@ -8,7 +8,7 @@ KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
 
 KMACHINE:corei7-64-intel-common = "intel-corei7-64"
 KMACHINE:core2-32-intel-common = "intel-core2-32"
-KMACHINE:skylake-64-intel-common = "intel-corei7-64"
+KMACHINE:x86-64-v3-intel-common = "intel-corei7-64"
 
 INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915"
 KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"