From accc04b57bb68da4542bcecd49d95dcb03efd909 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Mon, 31 Mar 2014 16:24:10 +0200 Subject: Revert "linux-yocto: Remove redundant recipes" This commit renders the romley-ivb unbootable. Reverting it is NOT A FIX, it's just a workaround. We should have a proper fix for this at a later time. This reverts commit 09d485dcce6ed4b654abc0c8a630f1d36bc1a7d6. [LXCR-2923] Signed-off-by: Adrian Dudau Signed-off-by: George Nita --- common/recipes-kernel/linux/linux-yocto-dev.bbappend | 8 +------- common/recipes-kernel/linux/linux-yocto_3.10.bbappend | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'common/recipes-kernel') diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index f01933fe..45b6873a 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 += "features/amt/mei/mei.scc" +KERNEL_FEATURES_INTEL_COMMON = "" LINUX_VERSION_core2-32-intel-common = "3.14-rc8" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" @@ -17,9 +17,3 @@ SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7 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 650919f6..8843e085 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 += "features/amt/mei/mei.scc" +KERNEL_FEATURES_INTEL_COMMON = "" LINUX_VERSION_core2-32-intel-common = "3.10.33" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" @@ -17,9 +17,3 @@ SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de 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" -- cgit v1.2.3-54-g00ecf