summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-05-14 01:29:27 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-05-15 12:55:15 (GMT)
commitedbc0f5946a8b7b439a8cb23fc16b9027370c506 (patch)
tree79f9826c1f45660f7c49c9509678eb28fb262837
parent577764dac33e779a07e7cfe1c0eba652be64ee31 (diff)
downloadmeta-intel-edbc0f5946a8b7b439a8cb23fc16b9027370c506.tar.gz
fri2-noemgd: Use the common v3.14 kernel
This gets rid of the BSP specific kernel recipe for the crownbay-noemgd BSP. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf1
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend11
2 files changed, 1 insertions, 11 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 0a42d94..38454cc 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -6,6 +6,7 @@
6#@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits 6#@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits
7 7
8require conf/machine/include/intel-core2-32-common.inc 8require conf/machine/include/intel-core2-32-common.inc
9require conf/machine/include/intel-common-pkgarch.inc
9 10
10MACHINE_FEATURES += "wifi 3g pcbios efi" 11MACHINE_FEATURES += "wifi 3g pcbios efi"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 12MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend
deleted file mode 100644
index 8a65efe..0000000
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
4KMACHINE_fri2-noemgd = "fri2"
5KBRANCH_fri2-noemgd = "standard/base"
6KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
7LINUX_VERSION_fri2-noemgd = "3.14.2"
8SRCREV_machine_fri2-noemgd = "d0047ab24e8e92fc2a116b0bccfa10d6b84985be"
9SRCREV_meta_fri2-noemgd = "11e091dc40c53af6ea08ce491ae50fbb1b0b6377"
10
11module_autoload_iwlwifi = "iwlwifi"