From edbc0f5946a8b7b439a8cb23fc16b9027370c506 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 13 May 2014 18:29:27 -0700 Subject: 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 Signed-off-by: Tom Zanussi --- meta-fri2/conf/machine/fri2-noemgd.conf | 1 + meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend 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 @@ #@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits require conf/machine/include/intel-core2-32-common.inc +require conf/machine/include/intel-common-pkgarch.inc MACHINE_FEATURES += "wifi 3g pcbios efi" 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 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" -KMACHINE_fri2-noemgd = "fri2" -KBRANCH_fri2-noemgd = "standard/base" -KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" -LINUX_VERSION_fri2-noemgd = "3.14.2" -SRCREV_machine_fri2-noemgd = "d0047ab24e8e92fc2a116b0bccfa10d6b84985be" -SRCREV_meta_fri2-noemgd = "11e091dc40c53af6ea08ce491ae50fbb1b0b6377" - -module_autoload_iwlwifi = "iwlwifi" -- cgit v1.2.3-54-g00ecf