summaryrefslogtreecommitdiffstats
path: root/meta-fri2
diff options
context:
space:
mode:
Diffstat (limited to 'meta-fri2')
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend12
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.14.bbappend11
3 files changed, 18 insertions, 7 deletions
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"
11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5" 11MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
12 12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 13PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
14PREFERRED_VERSION_linux-yocto = "3.10%" 14PREFERRED_VERSION_linux-yocto = "3.14%"
15 15
16XSERVER ?= "${XSERVER_X86_BASE} \ 16XSERVER ?= "${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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION = "3.10.34"
4
5COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
6KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
7KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 6KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
9SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" 7LINUX_VERSION_fri2 = "3.10.35"
10SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" 8SRCREV_meta_fri2 = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
9SRCREV_machine_fri2 = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
11SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 10SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
12SRC_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" 11SRC_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"
15KMACHINE_fri2-noemgd = "fri2" 14KMACHINE_fri2-noemgd = "fri2"
16KBRANCH_fri2-noemgd = "standard/fri2" 15KBRANCH_fri2-noemgd = "standard/fri2"
17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 16KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
18SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" 17LINUX_VERSION_fri2-noemgd = "3.10.35"
19SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" 18SRCREV_meta_fri2-noemgd = "b6e58b33dd427fe471f8827c83e311acdf4558a4"
19SRCREV_machine_fri2-noemgd = "cee957655fe67826b2e827e2db41f156fa8f0cc4"
20 20
21module_autoload_iwlwifi = "iwlwifi" 21module_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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
4KMACHINE_fri2-noemgd = "fri2"
5KBRANCH_fri2-noemgd = "standard/fri2"
6KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
7LINUX_VERSION_fri2-noemgd = "3.14.0"
8SRCREV_machine_fri2-noemgd = "0143c6ebb4a2d63b241df5f608b19f483f7eb9e0"
9SRCREV_meta_fri2-noemgd = "fc8c30398dbc3cdea787a1042242d4aab689d0ae"
10
11module_autoload_iwlwifi = "iwlwifi"