diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-09-21 09:49:29 -0700 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2012-09-24 12:51:49 -0700 |
commit | 1cd94a80c8481593f636076f55c89b1739ce46e2 (patch) | |
tree | d4f99d92b062f7e9b727b1d36259e81ad795df65 | |
parent | 5eac2e8a4714d6639a757e2432ad777382f18942 (diff) | |
download | meta-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>
-rw-r--r-- | meta-fri2/conf/machine/fri2-noemgd.conf | 2 | ||||
-rw-r--r-- | meta-fri2/conf/machine/fri2.conf | 6 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | 15 | ||||
-rw-r--r-- | meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | 15 |
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 92052927..3c25817c 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.2%" | 14 | PREFERRED_VERSION_linux-yocto = "3.4%" |
15 | 15 | ||
16 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 16 | XSERVER ?= "${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 39fb6984..dff11a88 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" | |||
15 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" | 15 | MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}" |
16 | 16 | ||
17 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 17 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
18 | PREFERRED_VERSION_linux-yocto = "3.2%" | 18 | PREFERRED_VERSION_linux-yocto = "3.4%" |
19 | 19 | ||
20 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 20 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
21 | ${XSERVER_IA32_EXT} \ | 21 | ${XSERVER_IA32_EXT} \ |
@@ -23,9 +23,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ | |||
23 | " | 23 | " |
24 | 24 | ||
25 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | 25 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" |
26 | PREFERRED_VERSION_mesa-dri ?= "7.11" | 26 | PREFERRED_VERSION_mesa-dri ?= "8.0.4" |
27 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" | 27 | PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" |
28 | PREFERRED_VERSION_emgd-driver-bin ?= "1.10" | 28 | PREFERRED_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 00000000..a99bb82d --- /dev/null +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.4.bbappend | |||
@@ -0,0 +1,15 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_fri2 = "fri2" | ||
4 | KMACHINE_fri2 = "fri2" | ||
5 | #KBRANCH_fri2 = "standard/preempt-rt/fri2" | ||
6 | SRCREV_machine_pn-linux-yocto-rt_fri2 ?= "4ed758e1861621b6db687498e88991b5034cfa78" | ||
7 | #SRCREV_meta_pn-linux-yocto-rt_fri2 ?= #"c5bddf8ea379406ffec550528e17b777a0eba24b" | ||
8 | |||
9 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | ||
10 | KMACHINE_fri2-noemgd = "fri2" | ||
11 | #KBRANCH_fri2-noemgd = "standard/preempt-rt/fri2" | ||
12 | SRCREV_machine_pn-linux-yocto-rt_fri2-noemgd ?= "4ed758e1861621b6db687498e88991b5034cfa78" | ||
13 | #SRCREV_meta_pn-linux-yocto-rt_fri2-noemgd ?= "c5bddf8ea379406ffec550528e17b777a0eba24b" | ||
14 | |||
15 | module_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 00000000..4c004135 --- /dev/null +++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend | |||
@@ -0,0 +1,15 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_fri2 = "fri2" | ||
4 | KMACHINE_fri2 = "fri2" | ||
5 | KBRANCH_fri2 = "standard/fri2" | ||
6 | SRCREV_machine_pn-linux-yocto_fri2 ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" | ||
7 | #SRCREV_meta_pn-linux-yocto_fri2 ?= "c5bddf8ea379406ffec550528e17b777a0eba24b" | ||
8 | |||
9 | COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" | ||
10 | KMACHINE_fri2-noemgd = "fri2" | ||
11 | KBRANCH_fri2-noemgd = "standard/fri2" | ||
12 | SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "59c3ff750831338d05ab67d5efd7fc101c451aff" | ||
13 | #SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "c5bddf8ea379406ffec550528e17b777a0eba24b" | ||
14 | |||
15 | module_autoload_iwlwifi = "iwlwifi" | ||