summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-04 22:33:10 (GMT)
committerCalifornia Sullivan <california.l.sullivan@intel.com>2018-04-06 20:23:47 (GMT)
commit006d2f0c9fcda8f7b25e558256715bec6fef65d4 (patch)
tree1b505d2af24ea7d9eb10dc796e5d761d80a94349 /recipes-kernel
parent19be124b3ef12909901ced36c5abf433692e7c92 (diff)
downloadmeta-intel-006d2f0c9fcda8f7b25e558256715bec6fef65d4.tar.gz
linux-intel.inc: use meta-intel-compat-kernel.inc
And simplify the recipe a bit. Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-intel.inc17
1 files changed, 3 insertions, 14 deletions
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 0b9e617..2525c70 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -1,10 +1,10 @@
1require recipes-kernel/linux/linux-yocto.inc 1require recipes-kernel/linux/linux-yocto.inc
2require recipes-kernel/linux/meta-intel-compat-kernel.inc
2 3
3FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" 4FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:"
4 5
5KERNEL_CONFIG_URI ?= " \ 6KERNEL_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 "
8SRC_URI = " \ 8SRC_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
14SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" 14SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg"
15 15
16
17LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" 16LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}"
18 17
19PV = "${LINUX_VERSION}+git${SRCPV}" 18PV = "${LINUX_VERSION}+git${SRCPV}"
@@ -21,17 +20,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
21KMETA = "kernel-meta" 20KMETA = "kernel-meta"
22KCONF_BSP_AUDIT_LEVEL = "2" 21KCONF_BSP_AUDIT_LEVEL = "2"
23 22
24KERNEL_FEATURES_INTEL_COMMON ?= ""
25
26COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" 23COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)"
27COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}"
28
29KMACHINE_core2-32-intel-common = "intel-core2-32"
30KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
31
32KMACHINE_corei7-64-intel-common = "intel-corei7-64"
33KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
34 24
35# Functionality flags
36KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 25KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
37KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" 26KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"