diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2014-05-13 18:29:27 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2014-05-14 21:03:41 -0500 |
commit | ad0c47e12de97dc182545666b176d20888b1c25f (patch) | |
tree | 79f9826c1f45660f7c49c9509678eb28fb262837 /meta-fri2 | |
parent | 33cc122fb72cd07bea9c0a7c1b7bc6d23c48ccf9 (diff) | |
download | meta-intel-ad0c47e12de97dc182545666b176d20888b1c25f.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>
Diffstat (limited to 'meta-fri2')
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 1 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend | 11 |
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 0a42d94d..38454cc1 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 | ||
8 | require conf/machine/include/intel-core2-32-common.inc | 8 | require conf/machine/include/intel-core2-32-common.inc |
9 | require conf/machine/include/intel-common-pkgarch.inc | ||
9 | 10 | ||
10 | MACHINE_FEATURES += "wifi 3g pcbios efi" | 11 | MACHINE_FEATURES += "wifi 3g pcbios efi" |
11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 12 | MACHINE_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 8a65efeb..00000000 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | ||
4 | KMACHINE_fri2-noemgd = "fri2" | ||
5 | KBRANCH_fri2-noemgd = "standard/base" | ||
6 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | ||
7 | LINUX_VERSION_fri2-noemgd = "3.14.2" | ||
8 | SRCREV_machine_fri2-noemgd = "d0047ab24e8e92fc2a116b0bccfa10d6b84985be" | ||
9 | SRCREV_meta_fri2-noemgd = "11e091dc40c53af6ea08ce491ae50fbb1b0b6377" | ||
10 | |||
11 | module_autoload_iwlwifi = "iwlwifi" | ||