diff options
20 files changed, 96 insertions, 66 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index 45b6873a..4fe4088b 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
@@ -14,6 +14,6 @@ LINUX_VERSION_corei7-64-intel-common = "3.14-rc8" | |||
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" | 15 | SRCREV_meta_corei7-64-intel-common = "3689f99f4d2a051e8d3ff72345a67d4d04a88020" |
16 | SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" | 16 | SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7c" |
17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_intel-corei7-64-intel-common = "standard/base" | 18 | KBRANCH_corei7-64-intel-common = "standard/base" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
diff --git a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend index cfb41930..f4712ef8 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend | |||
@@ -14,6 +14,6 @@ KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | |||
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | #SRCREV_meta_corei7-64-intel-common = "${AUTOREV}" | 15 | #SRCREV_meta_corei7-64-intel-common = "${AUTOREV}" |
16 | #SRCREV_machine_corei7-64-intel-common = "${AUTOREV}" | 16 | #SRCREV_machine_corei7-64-intel-common = "${AUTOREV}" |
17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_intel-corei7-64-intel-common = "standard/preempt-rt/base" | 18 | KBRANCH_corei7-64-intel-common = "standard/preempt-rt/base" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 902f987e..1ab0a356 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -2,18 +2,18 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
2 | 2 | ||
3 | KERNEL_FEATURES_INTEL_COMMON = "" | 3 | KERNEL_FEATURES_INTEL_COMMON = "" |
4 | 4 | ||
5 | LINUX_VERSION_core2-32-intel-common = "3.10.34" | 5 | LINUX_VERSION_core2-32-intel-common = "3.10.35" |
6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" |
7 | SRCREV_meta_core2-32-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 7 | SRCREV_meta_core2-32-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
8 | SRCREV_machine_core2-32-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 8 | SRCREV_machine_core2-32-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
9 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 9 | KMACHINE_core2-32-intel-common = "intel-core2-32" |
10 | KBRANCH_core2-32-intel-common = "standard/base" | 10 | KBRANCH_core2-32-intel-common = "standard/base" |
11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 11 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
12 | 12 | ||
13 | LINUX_VERSION_corei7-64-intel-common = "3.10.34" | 13 | LINUX_VERSION_corei7-64-intel-common = "3.10.35" |
14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 14 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" |
15 | SRCREV_meta_corei7-64-intel-common = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 15 | SRCREV_meta_corei7-64-intel-common = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
16 | SRCREV_machine_corei7-64-intel-common = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 16 | SRCREV_machine_corei7-64-intel-common = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
17 | KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" | 17 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" |
18 | KBRANCH_intel-corei7-64-intel-common = "standard/base" | 18 | KBRANCH_corei7-64-intel-common = "standard/base" |
19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 19 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
diff --git a/common/recipes-kernel/linux/linux-yocto_3.14.bbappend b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend new file mode 100644 index 00000000..9c1dd6af --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -0,0 +1,26 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | # For NUC | ||
4 | KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" | ||
5 | |||
6 | LINUX_VERSION_core2-32-intel-common = "3.14.0" | ||
7 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | ||
8 | SRCREV_meta_core2-32-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||
9 | SRCREV_machine_core2-32-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
10 | KMACHINE_core2-32-intel-common = "intel-core2-32" | ||
11 | KBRANCH_core2-32-intel-common = "standard/base" | ||
12 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
13 | |||
14 | LINUX_VERSION_corei7-64-intel-common = "3.14.0" | ||
15 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | ||
16 | SRCREV_meta_corei7-64-intel-common = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||
17 | SRCREV_machine_corei7-64-intel-common = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
18 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | ||
19 | KBRANCH_corei7-64-intel-common = "standard/base" | ||
20 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | ||
21 | |||
22 | # For Crystalforest and Romley | ||
23 | module_autoload_uio = "uio" | ||
24 | |||
25 | # For FRI2, NUC | ||
26 | module_autoload_iwlwifi = "iwlwifi" | ||
diff --git a/conf/machine/intel-core2-32.conf b/conf/machine/intel-core2-32.conf index 92c2ec6a..5c3e714c 100644 --- a/conf/machine/intel-core2-32.conf +++ b/conf/machine/intel-core2-32.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #@DESCRIPTION: Machine configuration for 32 bit Intel Core 2 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. | 4 | #@DESCRIPTION: Machine configuration for 32 bit Intel Core 2 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev" | 6 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
7 | 7 | ||
8 | require conf/machine/include/meta-intel.inc | 8 | require conf/machine/include/meta-intel.inc |
9 | require conf/machine/include/intel-core2-32-common.inc | 9 | require conf/machine/include/intel-core2-32-common.inc |
diff --git a/conf/machine/intel-corei7-64.conf b/conf/machine/intel-corei7-64.conf index 6f9e1f67..2d355542 100644 --- a/conf/machine/intel-corei7-64.conf +++ b/conf/machine/intel-corei7-64.conf | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. | 4 | #@DESCRIPTION: Machine configuration for 64 bit Intel Core i7 CPU (and later) with MMX, SSE, SSE2, SSE3, and SSSE3 instruction set support. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. |
5 | 5 | ||
6 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto-dev" | 6 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
7 | 7 | ||
8 | require conf/machine/include/meta-intel.inc | 8 | require conf/machine/include/meta-intel.inc |
9 | require conf/machine/include/intel-corei7-64-common.inc | 9 | require conf/machine/include/intel-corei7-64-common.inc |
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index 42bbfb12..307d9bd2 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf | |||
@@ -6,7 +6,7 @@ | |||
6 | #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits | 6 | #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits |
7 | # i.e. E660 + EG20T | 7 | # i.e. E660 + EG20T |
8 | 8 | ||
9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
10 | 10 | ||
11 | require conf/machine/include/intel-core2-32-common.inc | 11 | require conf/machine/include/intel-core2-32-common.inc |
12 | 12 | ||
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend index 1b7ff84c..15d8b899 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -11,13 +11,13 @@ KMACHINE_crownbay-noemgd = "crownbay" | |||
11 | KBRANCH_crownbay-noemgd = "standard/crownbay" | 11 | KBRANCH_crownbay-noemgd = "standard/crownbay" |
12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | 12 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" |
13 | 13 | ||
14 | LINUX_VERSION = "3.10.34" | 14 | LINUX_VERSION_crownbay = "3.10.35" |
15 | 15 | SRCREV_meta_crownbay = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | |
16 | SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 16 | SRCREV_machine_crownbay = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
17 | SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" | ||
18 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 17 | SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
19 | 18 | ||
20 | SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 19 | LINUX_VERSION_crownbay-noemgd = "3.10.35" |
21 | SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 20 | SRCREV_meta_crownbay-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
21 | SRCREV_machine_crownbay-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | ||
22 | 22 | ||
23 | SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | 23 | SRC_URI_crownbay = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" |
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend new file mode 100644 index 00000000..60ebd446 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -0,0 +1,10 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" | ||
4 | KMACHINE_crownbay-noemgd = "crownbay" | ||
5 | KBRANCH_crownbay-noemgd = "standard/crownbay" | ||
6 | KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" | ||
7 | |||
8 | LINUX_VERSION_crownbay-noemgd = "3.14.0" | ||
9 | SRCREV_machine_crownbay-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
10 | SRCREV_meta_crownbay-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||
diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf b/meta-emenlow/conf/machine/emenlow-noemgd.conf index f7b11e6e..d8e5a5e4 100644 --- a/meta-emenlow/conf/machine/emenlow-noemgd.conf +++ b/meta-emenlow/conf/machine/emenlow-noemgd.conf | |||
@@ -5,7 +5,7 @@ | |||
5 | 5 | ||
6 | #@DESCRIPTION: Machine configuration for eMenlow based systems, like the Webs-2120 box, without the Intel-proprietary graphics bits | 6 | #@DESCRIPTION: Machine configuration for eMenlow based systems, like the Webs-2120 box, without the Intel-proprietary graphics bits |
7 | 7 | ||
8 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 8 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
9 | 9 | ||
10 | require conf/machine/include/intel-core2-32-common.inc | 10 | require conf/machine/include/intel-core2-32-common.inc |
11 | 11 | ||
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend index 3bf0182b..dae9c909 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -11,13 +11,13 @@ KMACHINE_emenlow-noemgd = "emenlow" | |||
11 | KBRANCH_emenlow-noemgd = "standard/emenlow" | 11 | KBRANCH_emenlow-noemgd = "standard/emenlow" |
12 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" | 12 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" |
13 | 13 | ||
14 | LINUX_VERSION = "3.10.25" | 14 | LINUX_VERSION_emenlow = "3.10.35" |
15 | 15 | SRCREV_meta_emenlow = "b6e58b33dd427fe471f8827c83e311acdf4558a4" | |
16 | SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 16 | SRCREV_machine_emenlow = "cee957655fe67826b2e827e2db41f156fa8f0cc4" |
17 | SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f" | ||
18 | SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 17 | SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
19 | 18 | ||
20 | SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 19 | LINUX_VERSION_emenlow-noemgd = "3.10.35" |
21 | SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f" | 20 | SRCREV_meta_emenlow-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
21 | SRCREV_machine_emenlow-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | ||
22 | 22 | ||
23 | SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | 23 | SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" |
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend new file mode 100644 index 00000000..65df1a56 --- /dev/null +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -0,0 +1,10 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd" | ||
4 | KMACHINE_emenlow-noemgd = "emenlow" | ||
5 | KBRANCH_emenlow-noemgd = "standard/emenlow" | ||
6 | KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" | ||
7 | |||
8 | LINUX_VERSION_emenlow-noemgd = "3.14.0" | ||
9 | SRCREV_machine_emenlow-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
10 | SRCREV_meta_emenlow-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 43676b30..0a42d94d 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf | |||
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "wifi 3g pcbios efi" | |||
11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" | 11 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" |
12 | 12 | ||
13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
14 | PREFERRED_VERSION_linux-yocto = "3.10%" | 14 | PREFERRED_VERSION_linux-yocto = "3.14%" |
15 | 15 | ||
16 | XSERVER ?= "${XSERVER_X86_BASE} \ | 16 | XSERVER ?= "${XSERVER_X86_BASE} \ |
17 | ${XSERVER_X86_EXT} \ | 17 | ${XSERVER_X86_EXT} \ |
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend index 07eaa2a4..c1be2433 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | |||
@@ -1,13 +1,12 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | LINUX_VERSION = "3.10.34" | ||
4 | |||
5 | COMPATIBLE_MACHINE_fri2 = "fri2" | 3 | COMPATIBLE_MACHINE_fri2 = "fri2" |
6 | KMACHINE_fri2 = "fri2" | 4 | KMACHINE_fri2 = "fri2" |
7 | KBRANCH_fri2 = "standard/fri2" | 5 | KBRANCH_fri2 = "standard/fri2" |
8 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" | 6 | KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" |
9 | SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 7 | LINUX_VERSION_fri2 = "3.10.35" |
10 | SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 8 | SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
9 | SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | ||
11 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" | 10 | SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" |
12 | SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" | 11 | SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd" |
13 | 12 | ||
@@ -15,8 +14,9 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | |||
15 | KMACHINE_fri2-noemgd = "fri2" | 14 | KMACHINE_fri2-noemgd = "fri2" |
16 | KBRANCH_fri2-noemgd = "standard/fri2" | 15 | KBRANCH_fri2-noemgd = "standard/fri2" |
17 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | 16 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" |
18 | SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" | 17 | LINUX_VERSION_fri2-noemgd = "3.10.35" |
19 | SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" | 18 | SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4" |
19 | SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4" | ||
20 | 20 | ||
21 | module_autoload_iwlwifi = "iwlwifi" | 21 | module_autoload_iwlwifi = "iwlwifi" |
22 | 22 | ||
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend new file mode 100644 index 00000000..7098bacb --- /dev/null +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend | |||
@@ -0,0 +1,11 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | ||
4 | KMACHINE_fri2-noemgd = "fri2" | ||
5 | KBRANCH_fri2-noemgd = "standard/fri2" | ||
6 | KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" | ||
7 | LINUX_VERSION_fri2-noemgd = "3.14.0" | ||
8 | SRCREV_machine_fri2-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0" | ||
9 | SRCREV_meta_fri2-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae" | ||
10 | |||
11 | module_autoload_iwlwifi = "iwlwifi" | ||
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf index 8dca1385..216cca38 100644 --- a/meta-jasperforest/conf/machine/jasperforest.conf +++ b/meta-jasperforest/conf/machine/jasperforest.conf | |||
@@ -6,7 +6,7 @@ | |||
6 | #@DESCRIPTION: Machine configuration for Jasper Forest Picket Post | 6 | #@DESCRIPTION: Machine configuration for Jasper Forest Picket Post |
7 | # systems i.e. Xeon C5500/C3500 (Nehalem) + Intel 3420 chipset (Ibex Peak) | 7 | # systems i.e. Xeon C5500/C3500 (Nehalem) + Intel 3420 chipset (Ibex Peak) |
8 | 8 | ||
9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 9 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
10 | 10 | ||
11 | require conf/machine/include/intel-corei7-64-common.inc | 11 | require conf/machine/include/intel-corei7-64-common.inc |
12 | require conf/machine/include/intel-common-pkgarch.inc | 12 | require conf/machine/include/intel-common-pkgarch.inc |
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf index 7913dc21..fdbbbda8 100644 --- a/meta-nuc/conf/machine/nuc.conf +++ b/meta-nuc/conf/machine/nuc.conf | |||
@@ -6,10 +6,11 @@ | |||
6 | #@DESCRIPTION: Machine configuration for Intel NUC model DC3217IYE | 6 | #@DESCRIPTION: Machine configuration for Intel NUC model DC3217IYE |
7 | # i.e. Ivy Bridge + Panther Point | 7 | # i.e. Ivy Bridge + Panther Point |
8 | 8 | ||
9 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 9 | 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 50f8561c..00000000 --- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | |||
4 | COMPATIBLE_MACHINE_nuc = "nuc" | ||
5 | KMACHINE_nuc = "chiefriver" | ||
6 | KBRANCH_nuc = "standard/base" | ||
7 | |||
8 | KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" | ||
9 | |||
10 | LINUX_VERSION = "3.10.34" | ||
11 | |||
12 | SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4" | ||
13 | SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09" | ||
14 | |||
15 | module_autoload_iwlwifi_nuc = "iwlwifi" | ||
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index f2da68fb..87bc91c5 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | MACHINE_FEATURES += "va-impl-intel" | 9 | MACHINE_FEATURES += "va-impl-intel" |
10 | 10 | ||
11 | PREFERRED_VERSION_linux-yocto ?= "3.10%" | 11 | PREFERRED_VERSION_linux-yocto ?= "3.14%" |
12 | 12 | ||
13 | require conf/machine/include/intel-corei7-64-common.inc | 13 | require conf/machine/include/intel-corei7-64-common.inc |
14 | require conf/machine/include/intel-common-pkgarch.inc | 14 | require conf/machine/include/intel-common-pkgarch.inc |