diff options
Diffstat (limited to 'recipes-kernel')
33 files changed, 913 insertions, 0 deletions
diff --git a/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch b/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch new file mode 100644 index 00000000..353126fe --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-module/0001-zc-Force-4.10-get_user_pages_remote-API.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 3fcc81ad127c267018aed96a359bbf01db1bd8ee Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Sat, 1 Apr 2017 11:43:31 -0700 | ||
4 | Subject: [PATCH] zc: Force 4.10 get_user_pages_remote API | ||
5 | |||
6 | This change forces the newer API, as the linux-intel 4.9-LTS kernel | ||
7 | backported the 4.10 API change in the page handling code. | ||
8 | |||
9 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
10 | --- | ||
11 | zc.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/zc.c b/zc.c | ||
15 | index ae464ff..b2759ce 100644 | ||
16 | --- a/zc.c | ||
17 | +++ b/zc.c | ||
18 | @@ -65,7 +65,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, | ||
19 | #elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) | ||
20 | ret = get_user_pages_remote(task, mm, | ||
21 | (unsigned long)addr, pgcount, write, 0, pg, NULL); | ||
22 | -#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) | ||
23 | +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) & 0) | ||
24 | ret = get_user_pages_remote(task, mm, | ||
25 | (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, | ||
26 | pg, NULL); | ||
diff --git a/recipes-kernel/cryptodev/cryptodev-module_%.bbappend b/recipes-kernel/cryptodev/cryptodev-module_%.bbappend new file mode 100644 index 00000000..c59ddb2f --- /dev/null +++ b/recipes-kernel/cryptodev/cryptodev-module_%.bbappend | |||
@@ -0,0 +1,9 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | python() { | ||
4 | # When we add more kernels for linux-intel, we may have to add a Version check | ||
5 | if (d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel"): | ||
6 | src_uri = d.getVar("SRC_URI") | ||
7 | d.setVar("SRC_URI", src_uri + | ||
8 | " file://0001-zc-Force-4.10-get_user_pages_remote-API.patch") | ||
9 | } | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbe.bb b/recipes-kernel/intel-ethernet/ixgbe.bb new file mode 100644 index 00000000..181158d4 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbe.bb | |||
@@ -0,0 +1,45 @@ | |||
1 | SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE" | ||
2 | DESCRIPTION="Intel 10-Gbps Ethernet driver for Magnolia Park" | ||
3 | AUTHOR = "Ong Boon Leong" | ||
4 | HOMEPAGE = "http://www.intel.com/network/connectivity/products/server_adapters.htm" | ||
5 | SECTION = "kernel/network" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
8 | |||
9 | PV = "5.1.3" | ||
10 | PR = "r0" | ||
11 | |||
12 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/ixgbe-${PV}.tar.gz \ | ||
13 | file://0001-ixgbe-src-Makefile-change-make-install-to-make.patch \ | ||
14 | file://0001-ixgbe-skip-host-depmod.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "ae35ed547aa6a5087672c3f70ce1e676" | ||
18 | SRC_URI[sha256sum] = "9f537d79bddf0a087a17af632d57812d26d26bcfebbd4bdcf10df656ff055bb4" | ||
19 | |||
20 | S = "${WORKDIR}/${PN}-${PV}/src" | ||
21 | SCRIPT_DIR = "${WORKDIR}/${PN}-${PV}/scripts" | ||
22 | |||
23 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" \ | ||
24 | BUILD_ARCH="${TARGET_ARCH}" PREFIX="${D}" \ | ||
25 | SYSTEM_MAP_FILE="${STAGING_KERNEL_BUILDDIR}/System.map-${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | ||
26 | |||
27 | KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbe" | ||
28 | KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe" | ||
29 | |||
30 | inherit module | ||
31 | |||
32 | do_install_append () { | ||
33 | # Install scripts/set_irq_affinity | ||
34 | install -d ${D}/etc/network | ||
35 | install -m 0755 ${SCRIPT_DIR}/set_irq_affinity ${D}/etc/network | ||
36 | } | ||
37 | |||
38 | #SSTATE_DUPWHITELIST += "${STAGING_DIR_HOST}/lib/modules/${KERNEL_VERSION}/" | ||
39 | |||
40 | PACKAGES += "${PN}-script" | ||
41 | |||
42 | FILES_${PN}-script += "/etc/network/set_irq_affinity" | ||
43 | |||
44 | #Ignore "ERROR: QA Issue: ixgbe: Files/directories were installed but not shipped" | ||
45 | INSANE_SKIP_${PN} = "installed-vs-shipped" | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch new file mode 100644 index 00000000..e53f86e5 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From e32eab62e3f79ddd40946ca698d9e650bd7d9b2d Mon Sep 17 00:00:00 2001 | ||
2 | From: sweeaun <swee.aun.khor@intel.com> | ||
3 | Date: Sat, 7 Oct 2017 20:49:36 -0700 | ||
4 | Subject: [PATCH] ixgbe: skip host depmod | ||
5 | |||
6 | Upstream-Status: Inappropriate [Cross-Compile] | ||
7 | |||
8 | Depmod during do_install is irrelevant when cross-compiling. | ||
9 | Remove the depmod steps during do_install. | ||
10 | |||
11 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | ||
12 | --- | ||
13 | Makefile | 2 -- | ||
14 | 1 file changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index fa92f81..b39283a 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -141,8 +141,6 @@ modules_install: default manfile | ||
21 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
22 | @echo "Installing modules..." | ||
23 | @+$(call devkernelbuild,modules_install) | ||
24 | - @echo "Running depmod..." | ||
25 | - @$(call cmd_depmod) | ||
26 | |||
27 | uninstall: | ||
28 | rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko; | ||
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch new file mode 100644 index 00000000..88f5335a --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-src-Makefile-change-make-install-to-make.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 09c7a5afa76530a3720d97726f2b372f72b0af08 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Goh, Wen Sen" <wen.sen.goh@intel.com> | ||
3 | Date: Wed, 22 Jun 2016 11:18:37 +0800 | ||
4 | Subject: [PATCH] ixgbe: src/Makefile: change make install to make | ||
5 | modules_install | ||
6 | |||
7 | Per guideline from Linux Documentation at | ||
8 | Documentation/kbuild/modules.txt | ||
9 | the correct target is "modules_install" not "install". | ||
10 | |||
11 | Upstream-Status: Inappropriate [It is tarball released by Intel Network | ||
12 | driver group] | ||
13 | |||
14 | --- | ||
15 | src/Makefile | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile b/Makefile | ||
19 | index 852becb..480ecee 100644 | ||
20 | --- a/Makefile | ||
21 | +++ b/Makefile | ||
22 | @@ -136,7 +136,7 @@ clean: | ||
23 | @-rm -rf *.${MANSECTION}.gz *.ko | ||
24 | |||
25 | # Install the modules and manpage | ||
26 | -install: default manfile | ||
27 | +modules_install: default manfile | ||
28 | @echo "Copying manpages..." | ||
29 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
30 | @echo "Installing modules..." | ||
31 | @@ -191,6 +191,6 @@ help: | ||
32 | @echo ' Other variables may be available for tuning make process, see' | ||
33 | @echo ' Kernel Kbuild documentation for more information' | ||
34 | |||
35 | -.PHONY: default noisy clean manfile silent sparse ccc install uninstall help | ||
36 | +.PHONY: default noisy clean manfile silent sparse ccc modules_install uninstall help | ||
37 | |||
38 | endif # ifneq($(KERNELRELEASE),) | ||
39 | -- | ||
40 | 2.8.3 | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf.bb b/recipes-kernel/intel-ethernet/ixgbevf.bb new file mode 100644 index 00000000..6a9636e6 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbevf.bb | |||
@@ -0,0 +1,46 @@ | |||
1 | SUMMARY="ixgbevf kernel driver for Intel Magnolia Park 10GbE" | ||
2 | DESCRIPTION="Intel 10-Gbps Ethernet driver for Magnolia Park" | ||
3 | AUTHOR = "Ong Boon Leong" | ||
4 | HOMEPAGE = "http://www.intel.com/network/connectivity/products/server_adapters.htm" | ||
5 | SECTION = "kernel/network" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
8 | |||
9 | PV = "4.1.2" | ||
10 | PR = "r0" | ||
11 | |||
12 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/ixgbevf-${PV}.tar.gz \ | ||
13 | file://0001-ixgbevf-src-Makefile-change-make-install-to-make.patch \ | ||
14 | file://0002-ixgbevf_common.patch \ | ||
15 | file://0001-ixgbevf-skip-host-depmod.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "f02ec46369d1ca949a1e9d2e0eb74d5f" | ||
19 | SRC_URI[sha256sum] = "ab2824541f8a2d8f7b7d26ccbb46359ef551c5d4625fb333014e2b8023ac3ab6" | ||
20 | |||
21 | S = "${WORKDIR}/${PN}-${PV}/src" | ||
22 | SCRIPT_DIR = "${WORKDIR}/${PN}-${PV}/scripts" | ||
23 | |||
24 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" \ | ||
25 | BUILD_ARCH="${TARGET_ARCH}" PREFIX="${D}" \ | ||
26 | SYSTEM_MAP_FILE="${STAGING_KERNEL_BUILDDIR}/System.map-${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | ||
27 | |||
28 | KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf" | ||
29 | KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf" | ||
30 | |||
31 | inherit module | ||
32 | |||
33 | do_install_append () { | ||
34 | # Install scripts/set_irq_affinity | ||
35 | install -d ${D}/etc/network | ||
36 | install -m 0755 ${SCRIPT_DIR}/set_irq_affinity ${D}/etc/network | ||
37 | } | ||
38 | |||
39 | #SSTATE_DUPWHITELIST += "${STAGING_DIR_HOST}/lib/modules/${KERNEL_VERSION}/" | ||
40 | |||
41 | PACKAGES += "${PN}-script" | ||
42 | |||
43 | FILES_${PN}-script += "/etc/network/set_irq_affinity" | ||
44 | |||
45 | #Ignore "ERROR: QA Issue: ixgbe: Files/directories were installed but not shipped" | ||
46 | INSANE_SKIP_${PN} = "installed-vs-shipped" | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch new file mode 100644 index 00000000..656a897d --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 9677d09f5c3984997ac8e7d90b5d4b11fb9ce277 Mon Sep 17 00:00:00 2001 | ||
2 | From: sweeaun <swee.aun.khor@intel.com> | ||
3 | Date: Sat, 7 Oct 2017 20:56:35 -0700 | ||
4 | Subject: [PATCH] ixgbevf: skip host depmod | ||
5 | |||
6 | Upstream-Status: Inappropriate [Cross-Compile] | ||
7 | |||
8 | Depmod during do_install is irrelevant when cross-compiling. | ||
9 | Remove the depmod steps during do_install. | ||
10 | |||
11 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | ||
12 | --- | ||
13 | Makefile | 2 -- | ||
14 | 1 file changed, 2 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile b/Makefile | ||
17 | index 91df705..1dcf350 100644 | ||
18 | --- a/Makefile | ||
19 | +++ b/Makefile | ||
20 | @@ -104,8 +104,6 @@ modules_install: default manfile | ||
21 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
22 | @echo "Installing modules..." | ||
23 | @+$(call kernelbuild,modules_install) | ||
24 | - @echo "Running depmod..." | ||
25 | - @$(call cmd_depmod) | ||
26 | |||
27 | uninstall: | ||
28 | rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko; | ||
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch new file mode 100644 index 00000000..8234f589 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-src-Makefile-change-make-install-to-make.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 511ee0d8d40a3e76b3e9875a96228ff370dbdfc6 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Goh, Wen Sen" <wen.sen.goh@intel.com> | ||
3 | Date: Wed, 22 Jun 2016 11:25:41 +0800 | ||
4 | Subject: [PATCH] ixgbevf_patch | ||
5 | |||
6 | --- | ||
7 | Makefile | 4 ++-- | ||
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
9 | |||
10 | diff --git a/Makefile b/Makefile | ||
11 | index 8df134a..8d5660e 100644 | ||
12 | --- a/Makefile | ||
13 | +++ b/Makefile | ||
14 | @@ -100,7 +100,7 @@ clean: | ||
15 | @-rm -rf *.${MANSECTION}.gz *.ko | ||
16 | |||
17 | # Install the modules and manpage | ||
18 | -install: default manfile | ||
19 | +modules_install: default manfile | ||
20 | @echo "Copying manpages..." | ||
21 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
22 | @echo "Installing modules..." | ||
23 | @@ -145,6 +145,6 @@ help: | ||
24 | @echo ' Other variables may be available for tuning make process, see' | ||
25 | @echo ' Kernel Kbuild documentation for more information' | ||
26 | |||
27 | -.PHONY: default noisy clean manfile silent sparse ccc install uninstall help | ||
28 | +.PHONY: default noisy clean manfile silent sparse ccc modules_install uninstall help | ||
29 | |||
30 | endif # ifneq($(KERNELRELEASE),) | ||
31 | -- | ||
32 | 2.8.3 | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch b/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch new file mode 100644 index 00000000..d442e24d --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbevf/0002-ixgbevf_common.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From f74fbcd821a394dec58263fd2c2ea62eae298b2f Mon Sep 17 00:00:00 2001 | ||
2 | From: "Goh, Wen Sen" <wen.sen.goh@intel.com> | ||
3 | Date: Sun, 26 Jun 2016 12:01:36 +0800 | ||
4 | Subject: [PATCH] ixgbevf patch | ||
5 | |||
6 | --- | ||
7 | common.mk | 1 + | ||
8 | 1 file changed, 1 insertion(+) | ||
9 | |||
10 | diff --git a/common.mk b/common.mk | ||
11 | index b9b01c7..228a926 100644 | ||
12 | --- a/common.mk | ||
13 | +++ b/common.mk | ||
14 | @@ -289,6 +289,7 @@ export INSTALL_MOD_DIR ?= updates/drivers/net/ethernet/intel/${DRIVER} | ||
15 | kernelbuild = ${MAKE} $(if ${GCC_I_SYS},CC="${GCC_I_SYS}") \ | ||
16 | ${CCFLAGS_VAR}="${EXTRA_CFLAGS}" \ | ||
17 | -C "${KSRC}" \ | ||
18 | + CONFIG_IXGBE=m \ | ||
19 | CONFIG_${DRIVER_UPPERCASE}=m \ | ||
20 | M="${CURDIR}" \ | ||
21 | ${2} ${1}; | ||
22 | -- | ||
23 | 2.8.3 | ||
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch b/recipes-kernel/iwlwifi/backport-iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch new file mode 100644 index 00000000..1d4137ba --- /dev/null +++ b/recipes-kernel/iwlwifi/backport-iwlwifi/0001-Makefile.real-skip-host-install-scripts.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From f69ff2fd27903ee052309179271f708d720a2f94 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mikko Ylinen <mikko.ylinen@linux.intel.com> | ||
3 | Date: Thu, 10 Aug 2017 21:12:51 +0300 | ||
4 | Subject: [PATCH] Makefile.real: skip host install scripts | ||
5 | |||
6 | The scripts run in install target are relevant (and working) | ||
7 | only if the driver installation is run on the build host. | ||
8 | |||
9 | Skip the scripts when cross-compiling. | ||
10 | |||
11 | Upstream-Status: Inappropriate [Cross-Compile] | ||
12 | |||
13 | Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com> | ||
14 | --- | ||
15 | Makefile.real | 5 ----- | ||
16 | 1 file changed, 5 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile.real b/Makefile.real | ||
19 | index ba09f99..f5075de 100644 | ||
20 | --- a/Makefile.real | ||
21 | +++ b/Makefile.real | ||
22 | @@ -104,11 +104,6 @@ install: modules | ||
23 | @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \ | ||
24 | INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \ | ||
25 | modules_install | ||
26 | - @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) | ||
27 | - @./scripts/compress_modules.sh $(KLIB)/$(KMODDIR) | ||
28 | - @./scripts/check_depmod.sh | ||
29 | - @/sbin/depmod -a | ||
30 | - @./scripts/update-initramfs.sh $(KLIB) | ||
31 | @echo | ||
32 | @echo Your backported driver modules should be installed now. | ||
33 | @echo Reboot. | ||
34 | -- | ||
35 | 2.1.4 | ||
36 | |||
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch b/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch new file mode 100644 index 00000000..4fdc36f7 --- /dev/null +++ b/recipes-kernel/iwlwifi/backport-iwlwifi/0001-hrtimer-fix-version-numbers-because-production-kerne.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | From ecb29b78ce946c802058be0c46a0d20432f412e5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Saul Wold <sgw@linux.intel.com> | ||
3 | Date: Thu, 28 Sep 2017 10:51:15 -0700 | ||
4 | Subject: [PATCH] hrtimer: fix version numbers because production kernel has | ||
5 | update | ||
6 | |||
7 | Decrease the version check because the OTC production kernel which is | ||
8 | 4.9 includes the HRTimer code that this is using. | ||
9 | |||
10 | Upstream-Status: [Backport] It's been backported into the older kernel | ||
11 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
12 | --- | ||
13 | backport-include/linux/hrtimer.h | 2 +- | ||
14 | drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 2 +- | ||
15 | drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- | ||
16 | drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c | 2 +- | ||
17 | net/mac80211/tx.c | 2 +- | ||
18 | 5 files changed, 5 insertions(+), 5 deletions(-) | ||
19 | |||
20 | diff --git a/backport-include/linux/hrtimer.h b/backport-include/linux/hrtimer.h | ||
21 | index bdcf106e1..ae128852d 100644 | ||
22 | --- a/backport-include/linux/hrtimer.h | ||
23 | +++ b/backport-include/linux/hrtimer.h | ||
24 | @@ -4,7 +4,7 @@ | ||
25 | #include_next <linux/hrtimer.h> | ||
26 | #include <linux/interrupt.h> | ||
27 | |||
28 | -#if LINUX_VERSION_IS_LESS(4,10,0) | ||
29 | +#if LINUX_VERSION_IS_LESS(4,9,0) | ||
30 | static inline void backport_hrtimer_start(struct hrtimer *timer, s64 time, | ||
31 | const enum hrtimer_mode mode) | ||
32 | { | ||
33 | diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c | ||
34 | index cf1f95a01..e6f1ff294 100644 | ||
35 | --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c | ||
36 | +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c | ||
37 | @@ -1310,7 +1310,7 @@ static void iwl_mvm_tx_lat_add_ts_ack(struct sk_buff *skb) | ||
38 | s64 ts_1 = ktime_to_ns(skb->tstamp) >> 32; | ||
39 | s64 diff = temp - ts_1; | ||
40 | |||
41 | -#if LINUX_VERSION_IS_LESS(4,10,0) | ||
42 | +#if LINUX_VERSION_IS_LESS(4,9,0) | ||
43 | skb->tstamp.tv64 += diff; | ||
44 | #else | ||
45 | skb->tstamp += diff; | ||
46 | diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c | ||
47 | index df81bce25..ad664bacd 100644 | ||
48 | --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c | ||
49 | +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c | ||
50 | @@ -1955,7 +1955,7 @@ static void iwl_trans_pci_tx_lat_add_ts_write(struct sk_buff *skb) | ||
51 | s64 ts_1 = ktime_to_ns(skb->tstamp) >> 32; | ||
52 | s64 diff = temp - ts_1; | ||
53 | |||
54 | -#if LINUX_VERSION_IS_LESS(4,10,0) | ||
55 | +#if LINUX_VERSION_IS_LESS(4,9,0) | ||
56 | skb->tstamp.tv64 += diff << 16; | ||
57 | #else | ||
58 | skb->tstamp += diff << 16; | ||
59 | diff --git a/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c b/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c | ||
60 | index e4d45bcf7..cdd0ba9a2 100644 | ||
61 | --- a/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c | ||
62 | +++ b/drivers/net/wireless/intel/iwlwifi/trans_slave/shared.c | ||
63 | @@ -796,7 +796,7 @@ void iwl_slv_tx_lat_add_ts_write(struct iwl_trans_slv *trans_slv, | ||
64 | |||
65 | ts_1 = ktime_to_ns(data_entry->skb->tstamp) >> 32; | ||
66 | diff = temp - ts_1; | ||
67 | -#if LINUX_VERSION_IS_LESS(4,10,0) | ||
68 | +#if LINUX_VERSION_IS_LESS(4,9,0) | ||
69 | data_entry->skb->tstamp.tv64 += diff << 16; | ||
70 | #else | ||
71 | data_entry->skb->tstamp += diff << 16; | ||
72 | diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c | ||
73 | index 94a348688..0f226c413 100644 | ||
74 | --- a/net/mac80211/tx.c | ||
75 | +++ b/net/mac80211/tx.c | ||
76 | @@ -2278,7 +2278,7 @@ static void ieee80211_tx_latency_start_msrmnt(struct ieee80211_local *local, | ||
77 | if (!tx_latency && !tx_consec && !tx_thrshld) | ||
78 | return; | ||
79 | temp = ktime_to_ms(ktime_get()); | ||
80 | -#if LINUX_VERSION_IS_LESS(4,10,0) | ||
81 | +#if LINUX_VERSION_IS_LESS(4,9,0) | ||
82 | skb->tstamp.tv64 += temp << 32; | ||
83 | #else | ||
84 | skb->tstamp += temp << 32; | ||
85 | -- | ||
86 | 2.13.5 | ||
87 | |||
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi/iwlwifi.conf b/recipes-kernel/iwlwifi/backport-iwlwifi/iwlwifi.conf new file mode 100644 index 00000000..a0e5f6ff --- /dev/null +++ b/recipes-kernel/iwlwifi/backport-iwlwifi/iwlwifi.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | # /etc/modprobe.d/iwlwifi.conf | ||
2 | # iwlwifi will dynamically load either iwldvm or iwlmvm depending on the | ||
3 | # microcode file installed on the system. When removing iwlwifi, first | ||
4 | # remove the iwl?vm module and then iwlwifi. | ||
5 | remove iwlwifi (/sbin/lsmod | grep -o -e ^iwlmvm -e ^iwldvm16 -e ^iwldvm -e ^iwlwifi | xargs /sbin/rmmod) && /sbin/modprobe -r mac80211 | ||
6 | |||
7 | #options iwlwifi lar_disable=1 | ||
8 | #options iwlwifi nvm_file="nvm-sfp-b2-open.bin" | ||
9 | options iwlmvm power_scheme=1 | ||
10 | |||
11 | # PCI BUS | ||
12 | |||
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb new file mode 100644 index 00000000..d391045f --- /dev/null +++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb | |||
@@ -0,0 +1,56 @@ | |||
1 | SUMMARY = "Intel Wireless LinuxCore kernel driver" | ||
2 | DESCRIPTION = "Intel Wireless LinuxCore kernel driver" | ||
3 | SECTION = "kernel" | ||
4 | LICENSE = "GPLv2" | ||
5 | |||
6 | REQUIRED_DISTRO_FEATURES = "wifi" | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | ||
9 | |||
10 | inherit module | ||
11 | |||
12 | # For some iwfwifi LinuxCore supported wireless chips, the best/latest | ||
13 | # firmware blobs are found in the iwlwifi's linux-firmware.git fork. | ||
14 | # | ||
15 | # See: https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi/core_release | ||
16 | # | ||
17 | # When updating this recipe, ensure that the proper firmware is included from | ||
18 | # either the linux-firmware or iwlwifi-firmware repos. | ||
19 | |||
20 | PV = "30" | ||
21 | SRCREV = "b31221a99488021300e7f89d2ecf9bdd2bc52dd2" | ||
22 | |||
23 | # Add a patch for Intel's Production Kernel as it's got a backport of HRTimers | ||
24 | PK_PATCH = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/kernel','linux-intel','file://0001-hrtimer-fix-version-numbers-because-production-kerne.patch','',d)}" | ||
25 | |||
26 | SRC_URI = " \ | ||
27 | git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/LinuxCore${PV} \ | ||
28 | file://0001-Makefile.real-skip-host-install-scripts.patch \ | ||
29 | ${PK_PATCH} \ | ||
30 | file://iwlwifi.conf \ | ||
31 | " | ||
32 | |||
33 | S = "${WORKDIR}/git" | ||
34 | |||
35 | EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}" | ||
36 | |||
37 | do_configure() { | ||
38 | CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT} | ||
39 | } | ||
40 | |||
41 | MODULES_INSTALL_TARGET="install" | ||
42 | |||
43 | do_install_append() { | ||
44 | ## install configs and service scripts | ||
45 | install -d ${D}${sysconfdir}/modprobe.d | ||
46 | install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d | ||
47 | } | ||
48 | |||
49 | SYSTEMD_AUTO_ENABLE_${PN} = "enable" | ||
50 | |||
51 | RDEPENDS_${PN} = "linux-firmware-iwlwifi" | ||
52 | |||
53 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
54 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
55 | |||
56 | KERNEL_MODULE_PACKAGE_PREFIX = "backport-iwlwifi" | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_4.9.bb b/recipes-kernel/linux/linux-intel-rt_4.9.bb new file mode 100644 index 00000000..02192735 --- /dev/null +++ b/recipes-kernel/linux/linux-intel-rt_4.9.bb | |||
@@ -0,0 +1,17 @@ | |||
1 | |||
2 | require linux-intel.inc | ||
3 | |||
4 | # Skip processing of this recipe if it is not explicitly specified as the | ||
5 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
6 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
7 | # core-image-rt-sdk, core-image-rt. | ||
8 | python () { | ||
9 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": | ||
10 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | ||
11 | } | ||
12 | |||
13 | KBRANCH = "base-rt" | ||
14 | SRCREV_machine ?= "44f76edc2079f1551be33b8ab473349d00f814a7" | ||
15 | SRCREV_meta ?= "3d5b27b2d138b71052a1d17a5cca73aa0ec75328" | ||
16 | |||
17 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc new file mode 100644 index 00000000..1f26d451 --- /dev/null +++ b/recipes-kernel/linux/linux-intel.inc | |||
@@ -0,0 +1,40 @@ | |||
1 | require recipes-kernel/linux/linux-yocto.inc | ||
2 | |||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" | ||
4 | |||
5 | KERNEL_CONFIG_URI ?= " \ | ||
6 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA} \ | ||
7 | " | ||
8 | SRC_URI = " \ | ||
9 | git://github.com/01org/linux-intel-4.9.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
10 | ${KERNEL_CONFIG_URI} \ | ||
11 | " | ||
12 | |||
13 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | ||
14 | |||
15 | |||
16 | LINUX_VERSION ?= "4.9.56" | ||
17 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
18 | |||
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
20 | |||
21 | KMETA = "kernel-meta" | ||
22 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
23 | |||
24 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
25 | |||
26 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
27 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
28 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
29 | |||
30 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
31 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
32 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
33 | |||
34 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
35 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
36 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "features/qat/qat.scc" | ||
37 | |||
38 | # Functionality flags | ||
39 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
40 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||
diff --git a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg b/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg new file mode 100644 index 00000000..f7d7322e --- /dev/null +++ b/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg | |||
@@ -0,0 +1,14 @@ | |||
1 | # CONFIG_SND_SOC_INTEL_SKYLAKE is not set | ||
2 | # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set | ||
3 | # CONFIG_SND_SOC_INTEL_BXT_FLORIDA_MACH is not set | ||
4 | # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set | ||
5 | # CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set | ||
6 | # CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set | ||
7 | # CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set | ||
8 | # CONFIG_SND_SOC_INTEL_CNL_WM8281_MACH is not set | ||
9 | # CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set | ||
10 | # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set | ||
11 | # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set | ||
12 | # CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set | ||
13 | # CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set | ||
14 | # CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set | ||
diff --git a/recipes-kernel/linux/linux-intel_4.9.bb b/recipes-kernel/linux/linux-intel_4.9.bb new file mode 100644 index 00000000..ec239242 --- /dev/null +++ b/recipes-kernel/linux/linux-intel_4.9.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | |||
2 | require linux-intel.inc | ||
3 | |||
4 | KBRANCH = "base" | ||
5 | SRCREV_machine ?= "e8405acd549563650e2e4774a49e069d161e8fe1" | ||
6 | SRCREV_meta ?= "3d5b27b2d138b71052a1d17a5cca73aa0ec75328" | ||
7 | |||
8 | # For Crystalforest and Romley | ||
9 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
10 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
11 | |||
12 | # Functionality flags | ||
13 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | ||
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 00000000..ee33ecc3 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -0,0 +1,26 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | # Quark / X1000 BSP Info | ||
12 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
13 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
14 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
15 | |||
16 | # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV | ||
17 | # and setting them here breaks the default mechanism to use AUTOREV if the | ||
18 | # default SRCREV is set and linux-yocto-dev is the preferred provider. | ||
19 | |||
20 | # For Crystalforest and Romley | ||
21 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
22 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
23 | |||
24 | # For FRI2, NUC | ||
25 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
26 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend new file mode 100644 index 00000000..17569a1c --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend | |||
@@ -0,0 +1,13 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend new file mode 100644 index 00000000..17569a1c --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend | |||
@@ -0,0 +1,13 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend new file mode 100644 index 00000000..c18f4a11 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | LINUX_VERSION_INTEL_COMMON = "4.4.87" | ||
4 | SRCREV_META_INTEL_COMMON ?= "804d2b3164ec25ed519fd695de9aa0908460c92e" | ||
5 | SRCREV_MACHINE_INTEL_COMMON ?= "d1ce34c9e66fe55382cc196fe7facbe7865c4eed" | ||
6 | |||
7 | KBRANCH_INTEL_COMMON = "standard/preempt-rt/intel/base" | ||
8 | |||
9 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
10 | |||
11 | LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
12 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
13 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
14 | KBRANCH_core2-32-intel-common = "${KBRANCH_INTEL_COMMON}" | ||
15 | SRCREV_meta_core2-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
16 | SRCREV_machine_core2-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
17 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
18 | |||
19 | LINUX_VERSION_corei7-64-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
20 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
21 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
22 | KBRANCH_corei7-64-intel-common = "${KBRANCH_INTEL_COMMON}" | ||
23 | SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
24 | SRCREV_machine_corei7-64-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
25 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
26 | |||
27 | LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
28 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
29 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
30 | KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}" | ||
31 | SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
32 | SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
33 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend new file mode 100644 index 00000000..9d2e3c0b --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend | |||
@@ -0,0 +1,13 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON = "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
diff --git a/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend b/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend new file mode 100644 index 00000000..b8d3d81c --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend | |||
@@ -0,0 +1,19 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
4 | |||
5 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | |||
9 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base" | ||
10 | KBRANCH_core2-32-intel-common = "standard/tiny/base" | ||
11 | KBRANCH_corei7-64-intel-common = "standard/tiny/base" | ||
12 | |||
13 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
14 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
16 | |||
17 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
18 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
diff --git a/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend b/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend new file mode 100644 index 00000000..b8d3d81c --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend | |||
@@ -0,0 +1,19 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
4 | |||
5 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | |||
9 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base" | ||
10 | KBRANCH_core2-32-intel-common = "standard/tiny/base" | ||
11 | KBRANCH_corei7-64-intel-common = "standard/tiny/base" | ||
12 | |||
13 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
14 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
15 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
16 | |||
17 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
18 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
diff --git a/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend new file mode 100644 index 00000000..54430e21 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -0,0 +1,33 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar" | ||
4 | |||
5 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
6 | |||
7 | LINUX_VERSION_i586-nlp-32-intel-common = "4.4.87" | ||
8 | LINUX_VERSION_core2-32-intel-common = "4.4.87" | ||
9 | LINUX_VERSION_corei7-64-intel-common = "4.4.87" | ||
10 | |||
11 | SRCREV_meta_i586-nlp-32-intel-common = "804d2b3164ec25ed519fd695de9aa0908460c92e" | ||
12 | SRCREV_meta_core2-32-intel-common = "804d2b3164ec25ed519fd695de9aa0908460c92e" | ||
13 | SRCREV_meta_corei7-64-intel-common = "804d2b3164ec25ed519fd695de9aa0908460c92e" | ||
14 | |||
15 | SRCREV_machine_i586-nlp-32-intel-common = "85b913cc9d5e13602d69e50bd9cf1a6ef242f9ee" | ||
16 | SRCREV_machine_core2-32-intel-common = "85b913cc9d5e13602d69e50bd9cf1a6ef242f9ee" | ||
17 | SRCREV_machine_corei7-64-intel-common = "85b913cc9d5e13602d69e50bd9cf1a6ef242f9ee" | ||
18 | |||
19 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
20 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
21 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
22 | |||
23 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/intel/base" | ||
24 | KBRANCH_core2-32-intel-common = "standard/tiny/intel/base" | ||
25 | KBRANCH_corei7-64-intel-common = "standard/tiny/intel/base" | ||
26 | |||
27 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
28 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
29 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
30 | |||
31 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
32 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
33 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
diff --git a/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend b/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend new file mode 100644 index 00000000..9ecdb95a --- /dev/null +++ b/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend | |||
@@ -0,0 +1,31 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar" | ||
4 | |||
5 | LINUX_VERSION_i586-nlp-32-intel-common = "4.9.13" | ||
6 | LINUX_VERSION_core2-32-intel-common = "4.9.13" | ||
7 | LINUX_VERSION_corei7-64-intel-common = "4.9.13" | ||
8 | |||
9 | SRCREV_meta_i586-nlp-32-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de" | ||
10 | SRCREV_meta_core2-32-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de" | ||
11 | SRCREV_meta_corei7-64-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de" | ||
12 | |||
13 | SRCREV_machine_i586-nlp-32-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | ||
14 | SRCREV_machine_core2-32-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | ||
15 | SRCREV_machine_corei7-64-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098" | ||
16 | |||
17 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
18 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
19 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
20 | |||
21 | KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base" | ||
22 | KBRANCH_core2-32-intel-common = "standard/tiny/base" | ||
23 | KBRANCH_corei7-64-intel-common = "standard/tiny/base" | ||
24 | |||
25 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
26 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
27 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
28 | |||
29 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
30 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
31 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc" | ||
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend new file mode 100644 index 00000000..7c29be14 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_%.bbappend | |||
@@ -0,0 +1,4 @@ | |||
1 | # The kernel build is 64-bit regardless, so include both common overrides. | ||
2 | # Without this, the kernel will be missing vars that make it buildable for the | ||
3 | # intel-corei7-64 machine. | ||
4 | MACHINEOVERRIDES_prepend_corei7-64-x32-intel-common = "corei7-64-intel-common:" | ||
diff --git a/recipes-kernel/linux/linux-yocto_4.10.bbappend b/recipes-kernel/linux/linux-yocto_4.10.bbappend new file mode 100644 index 00000000..20504637 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.10.bbappend | |||
@@ -0,0 +1,21 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
14 | |||
15 | # For Crystalforest and Romley | ||
16 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
17 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
18 | |||
19 | # For FRI2, NUC | ||
20 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
21 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
diff --git a/recipes-kernel/linux/linux-yocto_4.12.bbappend b/recipes-kernel/linux/linux-yocto_4.12.bbappend new file mode 100644 index 00000000..20504637 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.12.bbappend | |||
@@ -0,0 +1,21 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
14 | |||
15 | # For Crystalforest and Romley | ||
16 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
17 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
18 | |||
19 | # For FRI2, NUC | ||
20 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
21 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
diff --git a/recipes-kernel/linux/linux-yocto_4.4.bbappend b/recipes-kernel/linux/linux-yocto_4.4.bbappend new file mode 100644 index 00000000..3b02a932 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -0,0 +1,43 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | LINUX_VERSION_INTEL_COMMON = "4.4.87" | ||
4 | SRCREV_META_INTEL_COMMON = "804d2b3164ec25ed519fd695de9aa0908460c92e" | ||
5 | SRCREV_MACHINE_INTEL_COMMON = "57746baa7ae35660fe807c65b6809e6b16d4a448" | ||
6 | |||
7 | KBRANCH_INTEL_COMMON = "standard/intel/base" | ||
8 | |||
9 | KERNEL_FEATURES_INTEL_COMMON ?= "" | ||
10 | |||
11 | LINUX_VERSION_core2-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
12 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
13 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
14 | KBRANCH_core2-32-intel-common = "${KBRANCH_INTEL_COMMON}" | ||
15 | SRCREV_meta_core2-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
16 | SRCREV_machine_core2-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
17 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
18 | |||
19 | LINUX_VERSION_corei7-64-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
20 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
21 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
22 | SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
23 | SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'a249f6388ace2a4035220c2333649b42c300faa9', '${SRCREV_MACHINE_INTEL_COMMON}', d)}" | ||
24 | KBRANCH_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'standard/intel/bxt-rebase;rebaseable=1', '${KBRANCH_INTEL_COMMON}', d)}" | ||
25 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
26 | |||
27 | # Quark / X1000 BSP Info | ||
28 | LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}" | ||
29 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
30 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
31 | KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}" | ||
32 | SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}" | ||
33 | SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}" | ||
34 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
35 | |||
36 | |||
37 | # For Crystalforest and Romley | ||
38 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
39 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
40 | |||
41 | # For FRI2, NUC | ||
42 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
43 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
diff --git a/recipes-kernel/linux/linux-yocto_4.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend new file mode 100644 index 00000000..a09fe1a4 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend | |||
@@ -0,0 +1,21 @@ | |||
1 | KERNEL_FEATURES_INTEL_COMMON = "" | ||
2 | |||
3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
6 | |||
7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
10 | |||
11 | COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" | ||
12 | KMACHINE_i586-nlp-32-intel-common = "intel-quark" | ||
13 | KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" | ||
14 | |||
15 | # For Crystalforest and Romley | ||
16 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
17 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
18 | |||
19 | # For FRI2, NUC | ||
20 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | ||
21 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | ||
diff --git a/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch b/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch new file mode 100644 index 00000000..32b49b8d --- /dev/null +++ b/recipes-kernel/lttng/lttng-modules/0002-lttng-modules-PKT-4.9-yocto-build-failed.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From ebfdc8b8af17f9cf23c6878eb52476fde7b48e5c Mon Sep 17 00:00:00 2001 | ||
2 | From: Priyalee Kushwaha <priyalee.kushwaha@intel.com> | ||
3 | Date: Fri, 22 Sep 2017 14:40:57 -0700 | ||
4 | Subject: [PATCH] lttng-modules: PKT 4.9 yocto build failed | ||
5 | |||
6 | PKT 4.9 yocto kernel backports a patch from upstream and that | ||
7 | changes header include/linux/ktimer.h. Since this backported | ||
8 | patch is only relevant for PKT kernel, we need to carry this | ||
9 | patch. | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Kushwaha, Priyalee <priyalee.kushwaha@intel.com> | ||
13 | --- | ||
14 | instrumentation/events/lttng-module/timer.h | 6 +++--- | ||
15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
16 | |||
17 | diff --git a/instrumentation/events/lttng-module/timer.h b/instrumentation/events/lttng-module/timer.h | ||
18 | index d62fd25..59da988 100644 | ||
19 | --- a/instrumentation/events/lttng-module/timer.h | ||
20 | +++ b/instrumentation/events/lttng-module/timer.h | ||
21 | @@ -16,11 +16,11 @@ struct timer_list; | ||
22 | |||
23 | #endif /* _TRACE_TIMER_DEF_ */ | ||
24 | |||
25 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) | ||
26 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) | ||
27 | #define lttng_ktime_get_tv64(kt) (kt) | ||
28 | -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ | ||
29 | +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) */ | ||
30 | #define lttng_ktime_get_tv64(kt) ((kt).tv64) | ||
31 | -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */ | ||
32 | +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0)) */ | ||
33 | |||
34 | LTTNG_TRACEPOINT_EVENT_CLASS(timer_class, | ||
35 | |||
36 | -- | ||
37 | 2.7.4 | ||
38 | |||
diff --git a/recipes-kernel/lttng/lttng-modules_%.bbappend b/recipes-kernel/lttng/lttng-modules_%.bbappend new file mode 100644 index 00000000..dc1c4a74 --- /dev/null +++ b/recipes-kernel/lttng/lttng-modules_%.bbappend | |||
@@ -0,0 +1,7 @@ | |||
1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | ||
2 | |||
3 | |||
4 | LTTNG_PATCH = "${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/kernel','linux-intel linux-intel-rt','file://0002-lttng-modules-PKT-4.9-yocto-build-failed.patch','',d)}" | ||
5 | |||
6 | SRC_URI_append_intel-x86-common = " ${LTTNG_PATCH}" | ||
7 | |||