summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-04-02 21:27:07 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-04-04 19:45:31 (GMT)
commitb26946e8e7f1f3bb68625731b493156309449f5d (patch)
tree5b4e0ae86fc3defe9a4b4c1b258fbca2c59d8e15
parent3b45a0b5b22a2d6c72a819a8cb8717bbf45e6aab (diff)
downloadmeta-intel-b26946e8e7f1f3bb68625731b493156309449f5d.tar.gz
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 <nitin.a.kamble@intel.com>
-rw-r--r--meta-nuc/conf/machine/nuc.conf1
-rw-r--r--meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend13
-rw-r--r--meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend13
-rw-r--r--meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend13
4 files changed, 1 insertions, 39 deletions
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf
index b8d36ca..fdbbbda 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%"
10MACHINE_FEATURES += "va-impl-intel wifi" 10MACHINE_FEATURES += "va-impl-intel wifi"
11 11
12require conf/machine/include/intel-corei7-64-common.inc 12require conf/machine/include/intel-corei7-64-common.inc
13require conf/machine/include/intel-common-pkgarch.inc
13 14
14MACHINE_HWCODECS ?= "va-intel gst-va-intel" 15MACHINE_HWCODECS ?= "va-intel gst-va-intel"
15 16
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 6b631c6..0000000
--- a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3
4COMPATIBLE_MACHINE_nuc = "nuc"
5KMACHINE_nuc = "chiefriver"
6KBRANCH_nuc = "standard/common-pc-64/chiefriver"
7
8KERNEL_FEATURES_append_nuc = " features/amt/mei wifi"
9
10SRCREV_machine_nuc = "60536206ad300ccf5b2be2c2d449f4ab27170238"
11SRCREV_meta_nuc = "fe20c99783387dab779472ff50a88666da1c6391"
12
13module_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 d6055f7..0000000
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_nuc = "nuc"
4KMACHINE_nuc = "chiefriver"
5KBRANCH_nuc = "standard/base"
6
7KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi"
8
9LINUX_VERSION_nuc = "3.10.35"
10SRCREV_meta_nuc = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
11SRCREV_machine_nuc = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
12
13module_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 3abdf47..0000000
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_nuc = "nuc"
4KMACHINE_nuc = "chiefriver"
5KBRANCH_nuc = "standard/base"
6
7KERNEL_FEATURES_append_nuc = " features/amt/mei wifi"
8
9LINUX_VERSION_nuc = "3.14.0"
10SRCREV_machine_nuc = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
11SRCREV_meta_nuc = "fc8c30398dbc3cdea787a1042242d4aab689d0ae"
12
13module_autoload_iwlwifi_nuc = "iwlwifi"