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.conf14
-rw-r--r--meta-fri2/conf/machine/fri2.conf14
2 files changed, 21 insertions, 7 deletions
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index b02e0374..2bd12c38 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -17,15 +17,23 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
22XSERVER ?= "xserver-xf86-dri-lite \ 22XSERVER ?= "xserver-xorg \
23 xserver-xorg-extension-dri \
24 xserver-xorg-extension-dri2 \
25 xserver-xorg-extension-glx \
26 xserver-xorg-extension-extmod \
27 xserver-xorg-extension-dbe \
28 xserver-xorg-module-libint10 \
23 xf86-input-mouse \ 29 xf86-input-mouse \
24 xf86-input-keyboard \ 30 xf86-input-keyboard \
25 xf86-input-evdev \ 31 xf86-input-evdev \
26 xf86-input-synaptics \ 32 xf86-input-synaptics \
27 xf86-video-vesa" 33 xf86-video-vesa"
28 34
35PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
36
29SERIAL_CONSOLE = "115200 ttyS0" 37SERIAL_CONSOLE = "115200 ttyS0"
30 38
31MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" 39MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index eab4b505..e73d28fa 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -17,16 +17,22 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
22XSERVER ?= "xserver-xf86-dri-lite \ 22XSERVER ?= "xserver-xorg \
23 xserver-xorg-extension-dri \
24 xserver-xorg-extension-dri2 \
25 xserver-xorg-extension-glx \
26 xserver-xorg-extension-extmod \
27 xserver-xorg-extension-dbe \
28 xserver-xorg-module-libint10 \
23 xf86-input-mouse \ 29 xf86-input-mouse \
24 xf86-input-keyboard \ 30 xf86-input-keyboard \
25 xf86-input-evdev \ 31 xf86-input-evdev \
26 xf86-input-synaptics \ 32 xf86-input-synaptics \
27 emgd-driver-bin" 33 emgd-driver-bin"
28 34
29PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" 35PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
30PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 36PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
31 37
32SERIAL_CONSOLE = "115200 ttyS0" 38SERIAL_CONSOLE = "115200 ttyS0"