diff options
-rw-r--r-- | recipes-kernel/linux/linux-intel.inc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index 0b9e617a..2525c70d 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc | |||
@@ -1,10 +1,10 @@ | |||
1 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
2 | require recipes-kernel/linux/meta-intel-compat-kernel.inc | ||
2 | 3 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" | 4 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" |
4 | 5 | ||
5 | KERNEL_CONFIG_URI ?= " \ | 6 | KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}" |
6 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ | 7 | |
7 | " | ||
8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
9 | git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | 9 | git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ |
10 | file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ | 10 | file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ |
@@ -13,7 +13,6 @@ SRC_URI = " \ | |||
13 | 13 | ||
14 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | 14 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" |
15 | 15 | ||
16 | |||
17 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | 16 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" |
18 | 17 | ||
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 18 | PV = "${LINUX_VERSION}+git${SRCPV}" |
@@ -21,17 +20,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}" | |||
21 | KMETA = "kernel-meta" | 20 | KMETA = "kernel-meta" |
22 | KCONF_BSP_AUDIT_LEVEL = "2" | 21 | KCONF_BSP_AUDIT_LEVEL = "2" |
23 | 22 | ||
24 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
25 | |||
26 | COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" | 23 | COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" |
27 | COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}" | ||
28 | |||
29 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
30 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
31 | |||
32 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
33 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
34 | 24 | ||
35 | # Functionality flags | ||
36 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 25 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" |
37 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | 26 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" |