summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/qemuboot-intel.inc4
-rw-r--r--conf/machine/include/tune-skylake.inc28
-rw-r--r--conf/machine/intel-skylake-64.conf33
-rw-r--r--recipes-kernel/linux/meta-intel-compat-kernel.inc1
4 files changed, 66 insertions, 0 deletions
diff --git a/conf/machine/include/qemuboot-intel.inc b/conf/machine/include/qemuboot-intel.inc
index 6586cf0..88e20a3 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"
8QB_CPU_intel-corei7-64 = "-cpu Nehalem" 8QB_CPU_intel-corei7-64 = "-cpu Nehalem"
9QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64" 9QB_CPU_KVM_intel-corei7-64 = "-cpu kvm64"
10 10
11QB_SYSTEM_NAME_intel-skylake-64 = "qemu-system-x86_64"
12QB_CPU_intel-skylake-64 = "-cpu Skylake-Client"
13QB_CPU_KVM_intel-skylake-64 = "-cpu kvm64"
14
11QB_AUDIO_DRV = "alsa" 15QB_AUDIO_DRV = "alsa"
12QB_AUDIO_OPT = "-soundhw ac97,es1370" 16QB_AUDIO_OPT = "-soundhw ac97,es1370"
13QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1 uvesafb.task_timeout=-1" 17QB_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 0000000..78645de
--- /dev/null
+++ b/conf/machine/include/tune-skylake.inc
@@ -0,0 +1,28 @@
1# Settings for the GCC(1) cpu-type "skylake":
2#
3# Intel Skylake CPU with 64-bit extensions, MMX, SSE, SSE2, SSE3, SSSE3, SSE4.1,
4# SSE4.2, AVX, AVX2 and POPCNT instruction set support.
5#
6# This tune is recommended for Intel Skylake CPU (and beyond).
7#
8DEFAULTTUNE ?= "skylake-64"
9
10# Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
11require conf/machine/include/tune-core2.inc
12
13# Extra tune features
14TUNEVALID[skylake] = "Enable skylake specific processor optimizations"
15TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake -mtune=generic -mfpmath=sse -mavx2', '', d)}"
16
17# Extra tune selections
18
19AVAILTUNES += "skylake-64"
20TUNE_FEATURES_tune-skylake-64 = "${TUNE_FEATURES_tune-x86-64} skylake"
21BASE_LIB_tune-skylake-64 = "lib64"
22TUNE_PKGARCH_tune-skylake-64 = "skylake-64"
23PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} skylake-64"
24QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client"
25
26# Disable QEMU user
27MACHINE_FEATURES_remove = "qemu-usermode"
28
diff --git a/conf/machine/intel-skylake-64.conf b/conf/machine/intel-skylake-64.conf
new file mode 100644
index 0000000..51786ba
--- /dev/null
+++ b/conf/machine/intel-skylake-64.conf
@@ -0,0 +1,33 @@
1#@TYPE: Machine
2#@NAME: intel-skylake-64
3
4#@DESCRIPTION: Machine configuration for 64 bit Intel Skylake CPU (and later) with MMX, SSE, SSE2, SSE3, SSE4.1, SSE4.2, AVX, and AVX2 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
5
6require conf/machine/include/meta-intel.inc
7require conf/machine/include/x86-base.inc
8require conf/machine/include/tune-skylake.inc
9require conf/machine/include/intel-common-pkgarch.inc
10
11MACHINE_FEATURES += "efi"
12MACHINE_FEATURES += "wifi 3g nfc"
13MACHINE_FEATURES += "intel-ucode"
14
15MACHINE_HWCODECS ?= "intel-vaapi-driver gstreamer1.0-vaapi"
16
17XSERVER ?= "${XSERVER_X86_BASE} \
18 ${XSERVER_X86_EXT} \
19 ${XSERVER_X86_FBDEV} \
20 ${XSERVER_X86_I915} \
21 ${XSERVER_X86_I965} \
22 ${XSERVER_X86_MODESETTING} \
23 ${XSERVER_X86_VESA} \
24 ${XSERVER_X86_ASPEED_AST} \
25 "
26
27SYSLINUX_OPTS = "serial 0 115200"
28SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyS2"
29APPEND += "rootwait console=ttyS0,115200 console=tty0"
30
31IMAGE_FSTYPES += "wic"
32WKS_FILE ?= "${@bb.utils.contains_any("EFI_PROVIDER", "systemd-boot", "systemd-bootdisk-microcode.wks.in", "grub-bootdisk-microcode.wks.in", d)}"
33WKS_FILE_DEPENDS_append = " intel-microcode"
diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc
index be5056c..a985925 100644
--- a/recipes-kernel/linux/meta-intel-compat-kernel.inc
+++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc
@@ -8,6 +8,7 @@ KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}"
8 8
9KMACHINE_corei7-64-intel-common = "intel-corei7-64" 9KMACHINE_corei7-64-intel-common = "intel-corei7-64"
10KMACHINE_core2-32-intel-common = "intel-core2-32" 10KMACHINE_core2-32-intel-common = "intel-core2-32"
11KMACHINE_skylake-64-intel-common = "intel-corei7-64"
11 12
12INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" 13INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915"
13KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" 14KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}"