diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2014-04-02 14:27:07 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2014-04-04 14:45:31 -0500 |
commit | b26946e8e7f1f3bb68625731b493156309449f5d (patch) | |
tree | 5b4e0ae86fc3defe9a4b4c1b258fbca2c59d8e15 /meta-nuc | |
parent | 3b45a0b5b22a2d6c72a819a8cb8717bbf45e6aab (diff) | |
download | meta-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>
Diffstat (limited to 'meta-nuc')
-rw-r--r-- | meta-nuc/conf/machine/nuc.conf | 1 | ||||
-rw-r--r-- | meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend | 13 | ||||
-rw-r--r-- | meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 | ||||
-rw-r--r-- | meta-nuc/recipes-kernel/linux/linux-yocto_3.14.bbappend | 13 |
4 files changed, 1 insertions, 39 deletions
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%" | |||
10 | MACHINE_FEATURES += "va-impl-intel wifi" | 10 | MACHINE_FEATURES += "va-impl-intel wifi" |
11 | 11 | ||
12 | require conf/machine/include/intel-corei7-64-common.inc | 12 | require conf/machine/include/intel-corei7-64-common.inc |
13 | require conf/machine/include/intel-common-pkgarch.inc | ||
13 | 14 | ||
14 | MACHINE_HWCODECS ?= "va-intel gst-va-intel" | 15 | MACHINE_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 6b631c60..00000000 --- a/meta-nuc/recipes-kernel/linux/linux-yocto-dev.bbappend +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | |||
4 | COMPATIBLE_MACHINE_nuc = "nuc" | ||
5 | KMACHINE_nuc = "chiefriver" | ||
6 | KBRANCH_nuc = "standard/common-pc-64/chiefriver" | ||
7 | |||
8 | KERNEL_FEATURES_append_nuc = " features/amt/mei wifi" | ||
9 | |||
10 | SRCREV_machine_nuc = "60536206ad300ccf5b2be2c2d449f4ab27170238" | ||
11 | SRCREV_meta_nuc = "fe20c99783387dab779472ff50a88666da1c6391" | ||
12 | |||
13 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_nuc = "nuc" | ||
4 | KMACHINE_nuc = "chiefriver" | ||
5 | KBRANCH_nuc = "standard/base" | ||
6 | |||
7 | KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" | ||
8 | |||
9 | LINUX_VERSION_nuc = "3.10.35" | ||
10 | SRCREV_meta_nuc = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | ||
11 | SRCREV_machine_nuc = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | ||
12 | |||
13 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_nuc = "nuc" | ||
4 | KMACHINE_nuc = "chiefriver" | ||
5 | KBRANCH_nuc = "standard/base" | ||
6 | |||
7 | KERNEL_FEATURES_append_nuc = " features/amt/mei wifi" | ||
8 | |||
9 | LINUX_VERSION_nuc = "3.14.0" | ||
10 | SRCREV_machine_nuc = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
11 | SRCREV_meta_nuc = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||
12 | |||
13 | module_autoload_iwlwifi_nuc = "iwlwifi" | ||