summaryrefslogtreecommitdiffstats
path: root/meta-fri2
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-09-21 16:49:29 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2012-09-24 19:51:49 (GMT)
commit1cd94a80c8481593f636076f55c89b1739ce46e2 (patch)
treed4f99d92b062f7e9b727b1d36259e81ad795df65 /meta-fri2
parent5eac2e8a4714d6639a757e2432ad777382f18942 (diff)
downloadmeta-intel-1cd94a80c8481593f636076f55c89b1739ce46e2.tar.gz
fri2: Update to Linux 3.4 and EMGD 1.14
Update the fri2 machines to use linux-yocto 3.4 and EMGD 1.14. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-fri2')
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf6
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend15
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend15
4 files changed, 34 insertions, 4 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 9205292..3c25817 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.2%" 14PREFERRED_VERSION_linux-yocto = "3.4%"
15 15
16XSERVER ?= "${XSERVER_IA32_BASE} \ 16XSERVER ?= "${XSERVER_IA32_BASE} \
17 ${XSERVER_IA32_EXT} \ 17 ${XSERVER_IA32_EXT} \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 39fb698..dff11a8 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -15,7 +15,7 @@ MACHINE_FEATURES += "wifi 3g pcbios efi va-impl-mixvideo"
15MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" 15MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
16 16
17PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 17PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
18PREFERRED_VERSION_linux-yocto = "3.2%" 18PREFERRED_VERSION_linux-yocto = "3.4%"
19 19
20XSERVER ?= "${XSERVER_IA32_BASE} \ 20XSERVER ?= "${XSERVER_IA32_BASE} \
21 ${XSERVER_IA32_EXT} \ 21 ${XSERVER_IA32_EXT} \
@@ -23,9 +23,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
23 " 23 "
24 24
25PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 25PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
26PREFERRED_VERSION_mesa-dri ?= "7.11" 26PREFERRED_VERSION_mesa-dri ?= "8.0.4"
27PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 27PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
28PREFERRED_VERSION_emgd-driver-bin ?= "1.10" 28PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
29 29
30# Syslinux does not know about the 64MHz uart clock and it does not detect the 30# Syslinux does not know about the 64MHz uart clock and it does not detect the
31# serial device by number. Use the IO port directly and divide the baud down to 31# serial device by number. Use the IO port directly and divide the baud down to
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
new file mode 100644
index 0000000..a99bb82
--- /dev/null
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend
@@ -0,0 +1,15 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2"
5#KBRANCH_fri2 = "standard/preempt-rt/fri2"
6SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "4ed758e1861621b6db687498e88991b5034cfa78"
7#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= #"c5bddf8ea379406ffec550528e17b777a0eba24b"
8
9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
10KMACHINE_fri2-noemgd = "fri2"
11#KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2"
12SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "4ed758e1861621b6db687498e88991b5034cfa78"
13#SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "c5bddf8ea379406ffec550528e17b777a0eba24b"
14
15module_autoload_iwlwifi = "iwlwifi"
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
new file mode 100644
index 0000000..4c00413
--- /dev/null
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -0,0 +1,15 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/fri2"
6SRCREV_machine_pn-linux-yocto_fri2 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
7#SRCREV_meta_pn-linux-yocto_fri2 ?= "c5bddf8ea379406ffec550528e17b777a0eba24b"
8
9COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
10KMACHINE_fri2-noemgd = "fri2"
11KBRANCH_fri2-noemgd = "standard/fri2"
12SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "59c3ff750831338d05ab67d5efd7fc101c451aff"
13#SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "c5bddf8ea379406ffec550528e17b777a0eba24b"
14
15module_autoload_iwlwifi = "iwlwifi"