[meta-intel] [PATCH 1/6] linux-*: remove quark references from kernel
Saul Wold
sgw at linux.intel.com
Fri Dec 8 06:54:12 PST 2017
This is an early step to removing the meta-quark machine type, as
the Quark processor has been EOL'ed by Intel, this release will
remove it from the kernel recipes
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
recipes-kernel/linux/linux-intel.inc | 5 +----
recipes-kernel/linux/linux-yocto-dev.bbappend | 5 -----
recipes-kernel/linux/linux-yocto-rt_4.10.bbappend | 4 ----
recipes-kernel/linux/linux-yocto-rt_4.12.bbappend | 4 ----
recipes-kernel/linux/linux-yocto-rt_4.4.bbappend | 8 --------
recipes-kernel/linux/linux-yocto-rt_4.9.bbappend | 4 ----
recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend | 4 ----
recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend | 4 ----
recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | 7 -------
recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend | 7 -------
recipes-kernel/linux/linux-yocto_4.10.bbappend | 4 ----
recipes-kernel/linux/linux-yocto_4.12.bbappend | 4 ----
recipes-kernel/linux/linux-yocto_4.4.bbappend | 10 ----------
recipes-kernel/linux/linux-yocto_4.9.bbappend | 4 ----
14 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc
index 057779a..e0a7b56 100644
--- a/recipes-kernel/linux/linux-intel.inc
+++ b/recipes-kernel/linux/linux-intel.inc
@@ -23,7 +23,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
KERNEL_FEATURES_INTEL_COMMON ?= ""
-COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32|intel-quark)"
+COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)"
COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}"
KMACHINE_core2-32-intel-common = "intel-core2-32"
@@ -32,9 +32,6 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = "features/qat/qat.scc"
-
# Functionality flags
KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index ee33ecc..6173148 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -8,11 +8,6 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-# Quark / X1000 BSP Info
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
-
# NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV
# and setting them here breaks the default mechanism to use AUTOREV if the
# default SRCREV is set and linux-yocto-dev is the preferred provider.
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend
index 17569a1..de336b0 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.10.bbappend
@@ -7,7 +7,3 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-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
index 17569a1..de336b0 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.12.bbappend
@@ -7,7 +7,3 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-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
index c18f4a1..b8dba29 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend
@@ -23,11 +23,3 @@ KBRANCH_corei7-64-intel-common = "${KBRANCH_INTEL_COMMON}"
SRCREV_meta_corei7-64-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
SRCREV_machine_corei7-64-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-
-LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}"
-SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
-SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
-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
index 9d2e3c0..3e59179 100644
--- a/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_4.9.bbappend
@@ -7,7 +7,3 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-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
index b8d3d81..e8c2770 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_4.10.bbappend
@@ -2,18 +2,14 @@ FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
KERNEL_FEATURES_INTEL_COMMON ?= ""
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base"
KBRANCH_core2-32-intel-common = "standard/tiny/base"
KBRANCH_corei7-64-intel-common = "standard/tiny/base"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
KMACHINE_core2-32-intel-common = "intel-core2-32"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
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
index b8d3d81..e8c2770 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_4.12.bbappend
@@ -2,18 +2,14 @@ FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
KERNEL_FEATURES_INTEL_COMMON ?= ""
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base"
KBRANCH_core2-32-intel-common = "standard/tiny/base"
KBRANCH_corei7-64-intel-common = "standard/tiny/base"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
KMACHINE_core2-32-intel-common = "intel-core2-32"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
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
index 54430e2..84bb1d2 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend
@@ -4,30 +4,23 @@ EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${
KERNEL_FEATURES_INTEL_COMMON ?= ""
-LINUX_VERSION_i586-nlp-32-intel-common = "4.4.87"
LINUX_VERSION_core2-32-intel-common = "4.4.87"
LINUX_VERSION_corei7-64-intel-common = "4.4.87"
-SRCREV_meta_i586-nlp-32-intel-common = "804d2b3164ec25ed519fd695de9aa0908460c92e"
SRCREV_meta_core2-32-intel-common = "804d2b3164ec25ed519fd695de9aa0908460c92e"
SRCREV_meta_corei7-64-intel-common = "804d2b3164ec25ed519fd695de9aa0908460c92e"
-SRCREV_machine_i586-nlp-32-intel-common = "85b913cc9d5e13602d69e50bd9cf1a6ef242f9ee"
SRCREV_machine_core2-32-intel-common = "85b913cc9d5e13602d69e50bd9cf1a6ef242f9ee"
SRCREV_machine_corei7-64-intel-common = "85b913cc9d5e13602d69e50bd9cf1a6ef242f9ee"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-KBRANCH_i586-nlp-32-intel-common = "standard/tiny/intel/base"
KBRANCH_core2-32-intel-common = "standard/tiny/intel/base"
KBRANCH_corei7-64-intel-common = "standard/tiny/intel/base"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
KMACHINE_core2-32-intel-common = "intel-core2-32"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
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
index 9ecdb95..84d61ab 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_4.9.bbappend
@@ -2,30 +2,23 @@ FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:"
EXTRA_OEMAKE = "LD=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}ld AR=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/${TARGET_PREFIX}gcc-ar"
-LINUX_VERSION_i586-nlp-32-intel-common = "4.9.13"
LINUX_VERSION_core2-32-intel-common = "4.9.13"
LINUX_VERSION_corei7-64-intel-common = "4.9.13"
-SRCREV_meta_i586-nlp-32-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de"
SRCREV_meta_core2-32-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de"
SRCREV_meta_corei7-64-intel-common = "8f3bc608ae61c5333043167fa31bac33be93c3de"
-SRCREV_machine_i586-nlp-32-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
SRCREV_machine_core2-32-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
SRCREV_machine_corei7-64-intel-common = "95c0a80ee83f1cf8e59d733f36e8a9dfd50a0098"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
-KBRANCH_i586-nlp-32-intel-common = "standard/tiny/base"
KBRANCH_core2-32-intel-common = "standard/tiny/base"
KBRANCH_corei7-64-intel-common = "standard/tiny/base"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
KMACHINE_core2-32-intel-common = "intel-core2-32"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
-KERNEL_FEATURES_append_i586-nlp-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON} cfg/fs/ext4.scc"
diff --git a/recipes-kernel/linux/linux-yocto_4.10.bbappend b/recipes-kernel/linux/linux-yocto_4.10.bbappend
index 2050463..b99001e 100644
--- a/recipes-kernel/linux/linux-yocto_4.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.10.bbappend
@@ -8,10 +8,6 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-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"
diff --git a/recipes-kernel/linux/linux-yocto_4.12.bbappend b/recipes-kernel/linux/linux-yocto_4.12.bbappend
index 2050463..b99001e 100644
--- a/recipes-kernel/linux/linux-yocto_4.12.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.12.bbappend
@@ -8,10 +8,6 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-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"
diff --git a/recipes-kernel/linux/linux-yocto_4.4.bbappend b/recipes-kernel/linux/linux-yocto_4.4.bbappend
index 3b02a93..33d75f0 100644
--- a/recipes-kernel/linux/linux-yocto_4.4.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.4.bbappend
@@ -24,16 +24,6 @@ SRCREV_machine_corei7-64-intel-common ?= "${@bb.utils.contains('INTEL_MACHINE_SU
KBRANCH_corei7-64-intel-common = "${@bb.utils.contains('INTEL_MACHINE_SUBTYPE', 'broxton-m', 'standard/intel/bxt-rebase;rebaseable=1', '${KBRANCH_INTEL_COMMON}', d)}"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-# Quark / X1000 BSP Info
-LINUX_VERSION_i586-nlp-32-intel-common = "${LINUX_VERSION_INTEL_COMMON}"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-KBRANCH_i586-nlp-32-intel-common = "${KBRANCH_INTEL_COMMON}"
-SRCREV_meta_i586-nlp-32-intel-common ?= "${SRCREV_META_INTEL_COMMON}"
-SRCREV_machine_i586-nlp-32-intel-common ?= "${SRCREV_MACHINE_INTEL_COMMON}"
-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"
diff --git a/recipes-kernel/linux/linux-yocto_4.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend
index a09fe1a..9be620b 100644
--- a/recipes-kernel/linux/linux-yocto_4.9.bbappend
+++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend
@@ -8,10 +8,6 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
KMACHINE_corei7-64-intel-common = "intel-corei7-64"
KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
-COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
-KMACHINE_i586-nlp-32-intel-common = "intel-quark"
-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"
--
2.13.6
More information about the meta-intel
mailing list