[meta-intel] [PATCH 09/12] linux-yocto: Remove redundant recipes

Darren Hart dvhart at linux.intel.com
Tue Mar 4 14:40:56 PST 2014


Remove all redundant linux-yocto recipes where the BSP is able to
reuse the intel-common version.

This excludes the emgd BSPs, remove the noemgd variables from those
bbappends.

Update the common bbappends with the KERNEL_FEATURES and
module_autoload* statements from the consolidated bbappends.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  |  8 +++++++-
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  8 +++++++-
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 11 -----------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 ------------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 21 --------------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  9 ---------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 20 -------------------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 21 --------------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  9 ---------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 21 --------------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  7 -------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 16 ---------------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 10 ----------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 -----------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 13 ------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 15 --------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 21 --------------------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 15 --------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 ------------
 .../recipes-kernel/linux/linux-yocto-dev.bbappend  | 23 ----------------------
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  7 -------
 21 files changed, 14 insertions(+), 279 deletions(-)
 delete mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
 delete mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
 delete mode 100644 meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend

diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
index 083cb11..56bcecc 100644
--- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-KERNEL_FEATURES_INTEL_COMMON = ""
+KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
 
 #LINUX_VERSION_core2-32-intel-common = "3.13"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
@@ -17,3 +17,9 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_intel-corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+
+# For Crystalforest and Romley
+module_autoload_uio = "uio"
+
+# For FRI2
+module_autoload_iwlwifi = "iwlwifi"
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
index e3ebd3e..01e3f77 100644
--- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-KERNEL_FEATURES_INTEL_COMMON = ""
+KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc"
 
 #LINUX_VERSION_core2-32-intel-common = "3.10"
 COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
@@ -17,3 +17,9 @@ COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
 KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64"
 KBRANCH_intel-corei7-64-intel-common = "standard/base"
 KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
+
+# For Crystalforest and Romley
+module_autoload_uio = "uio"
+
+# For FRI2
+module_autoload_iwlwifi = "iwlwifi"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index a370cbd..0000000
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_chiefriver = "chiefriver"
-KMACHINE_chiefriver = "chiefriver"
-KBRANCH_chiefriver = "standard/common-pc-64/chiefriver"
-
-KERNEL_FEATURES_append_chiefriver = " features/amt/mei"
-
-SRCREV_machine_chiefriver = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_chiefriver = "fe20c99783387dab779472ff50a88666da1c6391"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 000f5d1..0000000
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_chiefriver = "chiefriver"
-KMACHINE_chiefriver = "chiefriver"
-KBRANCH_chiefriver = "standard/common-pc-64/chiefriver"
-
-KERNEL_FEATURES_append_chiefriver = " features/amt/mei/mei.scc"
-
-LINUX_VERSION = "3.10.19"
-
-SRCREV_meta_chiefriver = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_chiefriver = "a9ec82e355130160f9094e670bd5be0022a84194"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index a1fccfb..0000000
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_crownbay = "crownbay"
-KMACHINE_crownbay = "crownbay"
-KBRANCH_crownbay = "standard/crownbay"
-KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
-
-COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-KMACHINE_crownbay-noemgd = "crownbay"
-KBRANCH_crownbay-noemgd = "standard/crownbay"
-KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
-
-SRCREV_meta_crownbay = "fe20c99783387dab779472ff50a88666da1c6391"
-SRCREV_machine_crownbay = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_emgd_crownbay = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
-
-SRCREV_machine_crownbay-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_crownbay-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
-
-SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-dev.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 06021c9..86fe000 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,16 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-
 COMPATIBLE_MACHINE_crownbay = "crownbay"
 KMACHINE_crownbay = "crownbay"
 KBRANCH_crownbay = "standard/crownbay"
 KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
 
-COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-KMACHINE_crownbay-noemgd = "crownbay"
-KBRANCH_crownbay-noemgd = "standard/crownbay"
-KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
-
 LINUX_VERSION = "3.10.17"
 LINUX_VERSION = "3.10.19"
 
@@ -18,7 +12,4 @@ SRCREV_meta_crownbay = "d9cd83c0292bd4e2a6754a96761027252e726a42"
 SRCREV_machine_crownbay = "a9ec82e355130160f9094e670bd5be0022a84194"
 SRCREV_emgd_crownbay = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf"
 
-SRCREV_meta_crownbay-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_crownbay-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194"
-
 SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 51551ef..0000000
--- a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden"
-KMACHINE_crystalforest-gladden  = "crystalforest"
-KBRANCH_crystalforest-gladden  = "standard/common-pc-64/crystalforest"
-
-SRCREV_machine_pn-linux-yocto_crystalforest-gladden ?= "c03195ed6e3066494e3fb4be69154a57066e845b"
-SRCREV_meta_pn-linux-yocto_crystalforest-gladden ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad"
-
-COMPATIBLE_MACHINE_crystalforest-server = "crystalforest-server"
-KMACHINE_crystalforest-server  = "crystalforest"
-KBRANCH_crystalforest-server  = "standard/common-pc-64/crystalforest"
-
-SRCREV_machine_pn-linux-yocto_crystalforest-server ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta_pn-linux-yocto_crystalforest-server ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
-
-LINUX_VERSION = "3.10.19"
-
-module_autoload_uio = "uio"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 27714a6..0000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_emenlow = "emenlow"
-KMACHINE_emenlow = "emenlow"
-KBRANCH_emenlow = "standard/emenlow"
-KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
-
-COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
-KMACHINE_emenlow-noemgd = "emenlow"
-KBRANCH_emenlow-noemgd = "standard/emenlow"
-KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
-
-SRCREV_machine_emenlow = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_emenlow = "fe20c99783387dab779472ff50a88666da1c6391"
-SRCREV_emgd_emenlow = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
-
-SRCREV_machine_emenlow-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_emenlow-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
-
-SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-dev.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 6075783..1dcdf3c 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,23 +1,14 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow = "emenlow"
 KBRANCH_emenlow = "standard/emenlow"
 KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
 
-COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
-KMACHINE_emenlow-noemgd = "emenlow"
-KBRANCH_emenlow-noemgd = "standard/emenlow"
-KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
-
 LINUX_VERSION = "3.10.19"
 
 SRCREV_meta_emenlow = "d9cd83c0292bd4e2a6754a96761027252e726a42"
 SRCREV_machine_emenlow = "a9ec82e355130160f9094e670bd5be0022a84194"
 SRCREV_emgd_emenlow = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf"
 
-SRCREV_meta_emenlow-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_emenlow-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194"
-
 SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 5260561..0000000
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_fri2 = "fri2"
-KMACHINE_fri2 = "fri2"
-KBRANCH_fri2 = "standard/fri2"
-KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
-SRCREV_machine_fri2 = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_fri2 = "fe20c99783387dab779472ff50a88666da1c6391"
-SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
-
-COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
-KMACHINE_fri2-noemgd = "fri2"
-KBRANCH_fri2-noemgd = "standard/fri2"
-KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
-SRCREV_machine_fri2-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_fri2-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
-
-module_autoload_iwlwifi = "iwlwifi"
-
-SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-dev.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 56f2eed..a85f3f1 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -12,12 +12,5 @@ SRCREV_machine_fri2 = "a9ec82e355130160f9094e670bd5be0022a84194"
 SRCREV_emgd_fri2 = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf"
 SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
 
-COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
-KMACHINE_fri2-noemgd = "fri2"
-KBRANCH_fri2-noemgd = "standard/fri2"
-KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
-SRCREV_meta_fri2-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_fri2-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194"
-
 module_autoload_iwlwifi = "iwlwifi"
 
diff --git a/meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 0a12121..0000000
--- a/meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-KMETA = "meta"
-
-COMPATIBLE_MACHINE_haswell-wc = "haswell-wc"
-KMACHINE_haswell-wc = "haswell-wc"
-KBRANCH_haswell-wc = "standard/common-pc-64/base"
-
-KERNEL_FEATURES_haswell-wc += "features/amt/mei"
-
-LINUX_VERSION = "3.10.19"
-
-SRCREV_machine_haswell-wc = "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta_haswell-wc = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-
-SRC_URI_haswell-wc = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 5d6f92f..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-
-KMACHINE_jasperforest = "jasperforest"
-KBRANCH_jasperforest = "standard/common-pc-64/jasperforest"
-
-SRCREV_machine_jasperforest = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_jasperforest = "fe20c99783387dab779472ff50a88666da1c6391"
diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 45ab6b9..0000000
--- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_jasperforest = "jasperforest"
-
-KMACHINE_jasperforest = "jasperforest"
-KBRANCH_jasperforest = "standard/common-pc-64/jasperforest"
-
-LINUX_VERSION = "3.10.19"
-
-SRCREV_meta_jasperforest = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_jasperforest = "a9ec82e355130160f9094e670bd5be0022a84194"
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 6b631c6..0000000
--- a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_nuc = "nuc"
-KMACHINE_nuc = "chiefriver"
-KBRANCH_nuc = "standard/common-pc-64/chiefriver"
-
-KERNEL_FEATURES_append_nuc = " features/amt/mei wifi"
-
-SRCREV_machine_nuc = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_nuc = "fe20c99783387dab779472ff50a88666da1c6391"
-
-module_autoload_iwlwifi_nuc = "iwlwifi"
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index ec67460..0000000
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_nuc = "nuc"
-KMACHINE_nuc = "chiefriver"
-KBRANCH_nuc = "standard/common-pc-64/chiefriver"
-
-KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi"
-
-LINUX_VERSION = "3.10.19"
-
-SRCREV_meta_nuc = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_nuc = "a9ec82e355130160f9094e670bd5be0022a84194"
-
-module_autoload_iwlwifi_nuc = "iwlwifi"
diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 6fc0682..0000000
--- a/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_romley = "romley"
-
-KMACHINE_romley  = "romley"
-KBRANCH_romley  = "standard/common-pc-64/romley"
-
-SRCREV_machine_pn-linux-yocto_romley ?= "c03195ed6e3066494e3fb4be69154a57066e845b"
-SRCREV_meta_pn-linux-yocto_romley ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad"
-
-COMPATIBLE_MACHINE_romley-ivb = "romley-ivb"
-KMACHINE_romley-ivb  = "romley"
-KBRANCH_romley-ivb  = "standard/common-pc-64/romley"
-
-SRCREV_machine_pn-linux-yocto_romley-ivb ?= "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_meta_pn-linux-yocto_romley-ivb ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
-
-LINUX_VERSION = "3.10.19"
-
-module_autoload_uio = "uio"
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index f09fbf6..0000000
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_sugarbay = "sugarbay"
-
-KMACHINE_sugarbay = "sugarbay"
-KBRANCH_sugarbay = "standard/common-pc-64/sugarbay"
-
-LINUX_VERSION = "3.12.0"
-
-SRCREV_meta_sugarbay = "75feecae0382601045f508bcce104b3d4af1923d"
-SRCREV_machine_sugarbay = "1f274173a8335dc27daabd9d9fe2e19a8b3978d1"
-
-SRCREV_machine_sugarbay = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_sugarbay = "fe20c99783387dab779472ff50a88666da1c6391"
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 8811fca..0000000
--- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-COMPATIBLE_MACHINE_sugarbay = "sugarbay"
-
-KMACHINE_sugarbay = "sugarbay"
-KBRANCH_sugarbay = "standard/common-pc-64/sugarbay"
-KERNEL_FEATURES_append_sugarbay = " features/media/media-usb-webcams.scc"
-
-LINUX_VERSION = "3.10.19"
-
-SRCREV_meta_sugarbay = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_sugarbay = "a9ec82e355130160f9094e670bd5be0022a84194"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 63fc604..0000000
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-
-KMETA = "meta"
-
-COMPATIBLE_MACHINE_sys940x = "sys940x"
-KMACHINE_sys940x = "sys940x"
-KBRANCH_sys940x = "standard/sys940x"
-KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.16"
-
-COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
-KMACHINE_sys940x-noemgd = "sys940x"
-KBRANCH_sys940x-noemgd = "standard/sys940x"
-KERNEL_FEATURES_sys940x-noemgd = " cfg/vesafb"
-
-SRCREV_machine_sys940x = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_sys940x = "fe20c99783387dab779472ff50a88666da1c6391"
-SRCREV_emgd_sys940x = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
-
-SRCREV_machine_sys940x-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_sys940x-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
-
-SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-dev.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 1b71a77..a43e11e 100644
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -12,10 +12,3 @@ SRCREV_meta_sys940x = "d9cd83c0292bd4e2a6754a96761027252e726a42"
 SRCREV_machine_sys940x = "a9ec82e355130160f9094e670bd5be0022a84194"
 SRCREV_emgd_sys940x = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf"
 SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
-
-COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
-KMACHINE_sys940x-noemgd = "sys940x"
-KBRANCH_sys940x-noemgd = "standard/sys940x"
-KERNEL_FEATURES_sys940x-noemgd = " cfg/vesafb"
-SRCREV_meta_sys940x-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_sys940x-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194"
-- 
1.8.5.3



More information about the meta-intel mailing list