summaryrefslogtreecommitdiffstats
path: root/meta-fri2/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-fri2/conf')
-rw-r--r--meta-fri2/conf/machine/fri2-noemgd.conf2
-rw-r--r--meta-fri2/conf/machine/fri2.conf6
2 files changed, 4 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"
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 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"
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