CaROS/meta-intel
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel synced 2026-01-01 13:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-yocto: Remove redundant recipes

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

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

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
Darren Hart 2014-03-12 10:41:27 -07:00
parent bf3ae602ad
commit 09d485dcce
9 changed files with 14 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/recipes-kernel/linux/linux-yocto-dev.bbappend
View File

@ -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"

8
common/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -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"

20
meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -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"

16
meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -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"

10
meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend
View File

@ -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"

12
meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -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"

21
meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -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"

15
meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend
View File

@ -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"

13
meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
View File

@ -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"