From b26946e8e7f1f3bb68625731b493156309449f5d Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 2 Apr 2014 14:27:07 -0700 Subject: nuc: use common kernels Now the common kernel recipes are working for the NUC BSP, use it in place of the BSP specific kernel. Signed-off-by: Nitin A Kamble --- meta-nuc/conf/machine/nuc.conf | 1 + meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend | 13 ------------- meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 ------------- meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend | 13 ------------- 4 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend delete mode 100644 meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend delete mode 100644 meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf index b8d36ca9..fdbbbda8 100644 --- a/meta-nuc/conf/machine/nuc.conf +++ b/meta-nuc/conf/machine/nuc.conf @@ -10,6 +10,7 @@ PREFERRED_VERSION_linux-yocto ?= "3.14%" MACHINE_FEATURES += "va-impl-intel wifi" require conf/machine/include/intel-corei7-64-common.inc +require conf/machine/include/intel-common-pkgarch.inc MACHINE_HWCODECS ?= "va-intel gst-va-intel" diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend deleted file mode 100644 index 6b631c60..00000000 --- a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - - -COMPATIBLE_MACHINE_nuc = "nuc" -KMACHINE_nuc = "chiefriver" -KBRANCH_nuc = "standard/common-pc-64/chiefriver" - -KERNEL_FEATURES_append_nuc = " features/amt/mei wifi" - -SRCREV_machine_nuc = "60536206ad300ccf5b2be2c2d449f4ab27170238" -SRCREV_meta_nuc = "fe20c99783387dab779472ff50a88666da1c6391" - -module_autoload_iwlwifi_nuc = "iwlwifi" diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index d6055f73..00000000 --- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_nuc = "nuc" -KMACHINE_nuc = "chiefriver" -KBRANCH_nuc = "standard/base" - -KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" - -LINUX_VERSION_nuc = "3.10.35" -SRCREV_meta_nuc = "b6e58b33dd427fe471f8827c83e311acdf4558a4" -SRCREV_machine_nuc = "cee957655fe67826b2e827e2db41f156fa8f0cc4" - -module_autoload_iwlwifi_nuc = "iwlwifi" diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend deleted file mode 100644 index 3abdf477..00000000 --- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_nuc = "nuc" -KMACHINE_nuc = "chiefriver" -KBRANCH_nuc = "standard/base" - -KERNEL_FEATURES_append_nuc = " features/amt/mei wifi" - -LINUX_VERSION_nuc = "3.14.0" -SRCREV_machine_nuc = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" -SRCREV_meta_nuc = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" - -module_autoload_iwlwifi_nuc = "iwlwifi" -- cgit v1.2.3-54-g00ecf