From a9fba0f3bdf50d8bfa60946a7a7407383ae93e54 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Aug 2015 15:41:02 -0700 Subject: linux-yocto_4.1: Add bbappend This creates a new bbappend to allow the BSPs to select the 4.1 kernel as their base kernel. Signed-off-by: Saul Wold --- .../recipes-kernel/linux/linux-yocto_4.1.bbappend | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 common/recipes-kernel/linux/linux-yocto_4.1.bbappend diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend new file mode 100644 index 00000000..6830e3b9 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -0,0 +1,37 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" + +LINUX_VERSION_core2-32-intel-common = "4.1.2" +COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" +KMACHINE_core2-32-intel-common = "intel-core2-32" +KBRANCH_core2-32-intel-common = "standard/base" +SRCREV_meta_core2-32-intel-common ?= "45393dd54f5ad77d43014c407c2b3520da42f427" +SRCREV_machine_core2-32-intel-common ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f" +KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" + +LINUX_VERSION_corei7-64-intel-common = "4.1.2" +COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" +KMACHINE_corei7-64-intel-common = "intel-corei7-64" +KBRANCH_corei7-64-intel-common = "standard/base" +SRCREV_meta_corei7-64-intel-common ?= "45393dd54f5ad77d43014c407c2b3520da42f427" +SRCREV_machine_corei7-64-intel-common ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f" +KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" + +# Quark / X1000 BSP Info +LINUX_VERSION_i586-nlp-32-intel-common = "4.1.2" +COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" +KMACHINE_i586-nlp-32-intel-common = "intel-quark" +KBRANCH_i586-nlp-32-intel-common = "standard/base" +SRCREV_meta_i586-nlp-32-intel-common ?= "45393dd54f5ad77d43014c407c2b3520da42f427" +SRCREV_machine_i586-nlp-32-intel-common ?= "4e30e64c44df9e59bd13239951bb8d2b5b276e6f" +KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" + + +# For Crystalforest and Romley +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" + +# For FRI2, NUC +KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" +KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" -- cgit v1.2.3-54-g00ecf From 9168b1a87dd59612170411357edd8a784f6a8c07 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Aug 2015 15:43:14 -0700 Subject: intel-core*: use the 4.1 linux-yocto kernel Use the 4.1 kernel which is now the default in oe-core Signed-off-by: Saul Wold --- conf/machine/intel-core2-32.conf | 2 +- conf/machine/intel-corei7-64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 2a7aad1f..09303e31 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf @@ -8,7 +8,7 @@ require conf/machine/include/intel-core2-32-common.inc require conf/machine/include/intel-common-pkgarch.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.19%" +PREFERRED_VERSION_linux-yocto ?= "4.1%" MACHINE_FEATURES += "pcbios efi" MACHINE_FEATURES += "va-impl-intel" diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index d1d43082..cc16d621 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf @@ -8,7 +8,7 @@ require conf/machine/include/intel-corei7-64-common.inc require conf/machine/include/intel-common-pkgarch.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.19%" +PREFERRED_VERSION_linux-yocto ?= "4.1%" MACHINE_FEATURES += "pcbios efi" MACHINE_FEATURES += "va-impl-intel" -- cgit v1.2.3-54-g00ecf From cef364875479dcf113ad00c3647e48a714090979 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Aug 2015 15:44:54 -0700 Subject: intel-quark: use the 4.1 linux-yocto kernel Use the 4.1 kernel which is now the default in oe-core Signed-off-by: Saul Wold --- conf/machine/intel-quark.conf | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index b59e5664..e5df9417 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf @@ -7,9 +7,8 @@ require conf/machine/include/meta-intel.inc require conf/machine/include/intel-quark-common.inc require conf/machine/include/intel-common-pkgarch.inc -# Use dev kernel which is 4.1 based currently -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev" -PREFERRED_PROVIDER_linux-yocto ?= "linux-yocto-dev" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "4.1%" #Avoid pulling in GRUB MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" @@ -23,6 +22,3 @@ SERIAL_CONSOLE = "115200 ttyS1" APPEND += "console=ttyS1,115200 console=tty0" EFI_PROVIDER = "gummiboot" - - - -- cgit v1.2.3-54-g00ecf From adc8064908409d29b9f6a7f0710be400769807af Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Aug 2015 15:46:03 -0700 Subject: intel-quark: add CFLAGS for kernel to no use lock prefix The kernel needs to have the EXTRA_CFLAGS based via a variable as it does not pick up the CLFAGS from the tune file. Quark based kernel should not use the lock prefix. Signed-off-by: Saul Wold --- conf/machine/intel-quark.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/intel-quark.conf b/conf/machine/intel-quark.conf index e5df9417..7da054ec 100644 --- a/conf/machine/intel-quark.conf +++ b/conf/machine/intel-quark.conf @@ -22,3 +22,6 @@ SERIAL_CONSOLE = "115200 ttyS1" APPEND += "console=ttyS1,115200 console=tty0" EFI_PROVIDER = "gummiboot" + +# Ensure that the Lock prefix is omitted for the kernel" +KERNEL_EXTRA_ARGS = "EXTRA_CFLAGS=-Wa,-momit-lock-prefix=yes" -- cgit v1.2.3-54-g00ecf