summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb2
-rw-r--r--dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb2
-rw-r--r--recipes-kernel/linux/linux-intel-dev.bb8
-rw-r--r--recipes-kernel/linux/linux-intel-rt_5.15.bb12
-rw-r--r--recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch50
-rw-r--r--recipes-kernel/linux/linux-intel_5.15.bb12
6 files changed, 74 insertions, 12 deletions
diff --git a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb
index 5ac8b70..ee39f51 100644
--- a/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb
+++ b/dynamic-layers/clang-layer/recipes-core/dnn/onednn_2.6.1.bb
@@ -34,7 +34,7 @@ EXTRA_OECMAKE += " \
34 -DCMAKE_SKIP_RPATH=ON \ 34 -DCMAKE_SKIP_RPATH=ON \
35 " 35 "
36 36
37PACKAGECONFIG ??= "" 37PACKAGECONFIG ??= "gpu"
38PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime" 38PACKAGECONFIG[gpu] = "-DDNNL_GPU_RUNTIME=OCL, , opencl-headers ocl-icd, intel-compute-runtime"
39 39
40do_install:append () { 40do_install:append () {
diff --git a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
index 0442bec..7a994eb 100644
--- a/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
+++ b/dynamic-layers/clang-layer/recipes-opencl/igc/intel-graphics-compiler_1.0.11702.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://IGC/BiFModule/Implementation/ExternalLibraries/libclc
9 file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a" 9 file://NOTICES.txt;md5=7f4fbc3eb2c34807465e63b1ec3c9d1a"
10 10
11SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \ 11SRC_URI = "git://github.com/intel/intel-graphics-compiler.git;protocol=https;name=igc;branch=releases/igc-1.0.11702 \
12 git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;branch=master \ 12 git://github.com/intel/vc-intrinsics.git;protocol=https;destsuffix=git/vc-intrinsics;name=vc;nobranch=1 \
13 git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \ 13 git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=SPIRV-Tools;name=spirv-tools;branch=sdk-1.3.204 \
14 git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \ 14 git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=SPIRV-Headers;name=spirv-headers;branch=master \
15 file://0003-Improve-Reproducibility-for-src-package.patch \ 15 file://0003-Improve-Reproducibility-for-src-package.patch \
diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb
index 41f327b..f3ac12d 100644
--- a/recipes-kernel/linux/linux-intel-dev.bb
+++ b/recipes-kernel/linux/linux-intel-dev.bb
@@ -6,7 +6,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:"
6SRC_URI = " \ 6SRC_URI = " \
7 git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ 7 git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \
8 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ 8 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \
9 file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ 9 file://0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \
10 " 10 "
11SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg" 11SRC_URI:append:core2-32-intel-common = " file://disable_skylake_sound.cfg"
12 12
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
19 19
20DEPENDS += "elfutils-native openssl-native util-linux-native" 20DEPENDS += "elfutils-native openssl-native util-linux-native"
21 21
22LINUX_VERSION ?= "5.12.0" 22LINUX_VERSION ?= "5.19.0"
23SRCREV_machine ?= "9f4ad9e425a1d3b6a34617b8ea226d56a119a717" 23SRCREV_machine ?= "270ddbd02fe9e1761ebccf792acadbb3cd52b69f"
24SRCREV_meta ?= "99570241ac88d6c7e32b6fccd83afce53816b275" 24SRCREV_meta ?= "423df1333e1e2a0c2bff9b29d40d16d74b775a79"
25 25
26LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" 26LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}"
27PV = "${LINUX_VERSION}+git${SRCPV}" 27PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-intel-rt_5.15.bb b/recipes-kernel/linux/linux-intel-rt_5.15.bb
index 01d1c2f..112b407 100644
--- a/recipes-kernel/linux/linux-intel-rt_5.15.bb
+++ b/recipes-kernel/linux/linux-intel-rt_5.15.bb
@@ -16,12 +16,18 @@ KMETA_BRANCH = "yocto-5.15"
16 16
17DEPENDS += "elfutils-native openssl-native util-linux-native" 17DEPENDS += "elfutils-native openssl-native util-linux-native"
18 18
19LINUX_VERSION ?= "5.15.43" 19LINUX_VERSION ?= "5.15.49"
20SRCREV_machine ?= "9800b6da3fbf306dd172f2848423e5cc4060b604" 20SRCREV_machine ?= "1b50ff611e81294adb5936388c47246b9710b1a8"
21SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 21SRCREV_meta ?= "f7f709bf874f85baff9f2fb0ac0341c08399b144"
22 22
23LINUX_KERNEL_TYPE = "preempt-rt" 23LINUX_KERNEL_TYPE = "preempt-rt"
24 24
25# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which 25# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
26# causes config warning too. 26# causes config warning too.
27KCONF_AUDIT_LEVEL:core2-32-intel-common = "0" 27KCONF_AUDIT_LEVEL:core2-32-intel-common = "0"
28
29# We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel
30# https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f
31# It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c.
32# Suppress the harmless warning for now.
33KCONF_BSP_AUDIT_LEVEL = "0"
diff --git a/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
new file mode 100644
index 0000000..0ebbb00
--- /dev/null
+++ b/recipes-kernel/linux/linux-intel/0001-v5.19-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch
@@ -0,0 +1,50 @@
1From ecb938c19d20543382c9bbc42588c29b5ebfd3ed Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@windriver.com>
3Date: Fri, 12 Aug 2022 13:12:18 +0800
4Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location
5
6In some cross build environments such as the Yocto Project build
7environment it provides an ncurses library that is compiled
8differently than the host's version. This causes display corruption
9problems when the host's curses includes are used instead of the
10includes from the provided compiler are overridden. There is a second
11case where there is no curses libraries at all on the host system and
12menuconfig will just fail entirely.
13
14The solution is simply to allow an override variable in
15check-lxdialog.sh for environments such as the Yocto Project. Adding
16a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
17compiling and linking against the right headers and libraries.
18
19Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
20cc: Michal Marek <mmarek@suse.cz>
21cc: linux-kbuild@vger.kernel.org
22Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
23Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
24---
25 scripts/kconfig/mconf-cfg.sh | 9 +++++++++
26 1 file changed, 9 insertions(+)
27
28diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
29index 025b565e0b7c..6514d19790e6 100755
30--- a/scripts/kconfig/mconf-cfg.sh
31+++ b/scripts/kconfig/mconf-cfg.sh
32@@ -4,6 +4,15 @@
33 PKG="ncursesw"
34 PKG2="ncurses"
35
36+if [ "$CROSS_CURSES_LIB" != "" ]; then
37+ echo libs=\'$CROSS_CURSES_LIB\'
38+ if [ x"$CROSS_CURSES_INC" != x ]; then
39+ echo cflags=\'$CROSS_CURSES_INC\'
40+ fi
41+ exit 0
42+fi
43+
44+
45 if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then
46 if ${HOSTPKG_CONFIG} --exists $PKG; then
47 echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\"
48--
492.25.1
50
diff --git a/recipes-kernel/linux/linux-intel_5.15.bb b/recipes-kernel/linux/linux-intel_5.15.bb
index 3c05c0e..65dc418 100644
--- a/recipes-kernel/linux/linux-intel_5.15.bb
+++ b/recipes-kernel/linux/linux-intel_5.15.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
7 7
8DEPENDS += "elfutils-native openssl-native util-linux-native" 8DEPENDS += "elfutils-native openssl-native util-linux-native"
9 9
10LINUX_VERSION ?= "5.15.43" 10LINUX_VERSION ?= "5.15.49"
11SRCREV_machine ?= "1ec5959a8f6dbfbb47057317bc935924cd8d6977" 11SRCREV_machine ?= "8c7674099d42d20041c529f8772bd580a1a03d80"
12SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 12SRCREV_meta ?= "f7f709bf874f85baff9f2fb0ac0341c08399b144"
13 13
14# For Crystalforest and Romley 14# For Crystalforest and Romley
15KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" 15KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio"
@@ -21,3 +21,9 @@ KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/sec
21# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which 21# Disabling CONFIG_SND_SOC_INTEL_SKYLAKE for 32-bit, does not allow to set CONFIG_SND_SOC_INTEL_SST too, which
22# causes config warning too. 22# causes config warning too.
23KCONF_AUDIT_LEVEL:core2-32-intel-common = "0" 23KCONF_AUDIT_LEVEL:core2-32-intel-common = "0"
24
25# We've 8b766b0f8eece backported from v5.19 to linux-intel v5.15 kernel
26# https://github.com/torvalds/linux/commit/8b766b0f8eece55155146f7628610ce54a065e0f
27# It drops 'CONFIG_FB_BOOT_VESA_SUPPORT' config option which would result in a warning with 5.15 y-k-c.
28# Suppress the harmless warning for now.
29KCONF_BSP_AUDIT_LEVEL = "0"