From 7658dbaa94638f86bab45f5763565370e8854853 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 16 Aug 2011 15:59:55 -0500 Subject: meta-fri2: add EMGD 1.8 capabilities to fri2 This patch essentially adds a new EMGD-capable 'fri2' machine to meta-fri2. The current version with vesa graphics will become fri2-noemgd; fri2 will become the version with EMGD graphics. This patch does the fri2->fri2-noemgd renaming and adds the new files for fri2, and updates the necessary .bbappends to support both fri2 and fri2-noemgd. Signed-off-by: Tom Zanussi --- meta-fri2/conf/machine/fri2-noemgd.conf | 36 +++++++++++++++++++++++++++++++++ meta-fri2/conf/machine/fri2.conf | 5 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 meta-fri2/conf/machine/fri2-noemgd.conf (limited to 'meta-fri2/conf') diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf new file mode 100644 index 00000000..a8715294 --- /dev/null +++ b/meta-fri2/conf/machine/fri2-noemgd.conf @@ -0,0 +1,36 @@ +#@TYPE: Machine +#@NAME: fri2 + +#@DESCRIPTION: Machine configuration for Fish River Island II systems +# i.e. E660 + EG20T + +include conf/machine/include/tune-atom.inc + +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ + acpi serial usbgadget wifi 3g" + +KERNEL_IMAGETYPE = "bzImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.0%" + +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +XSERVER ?= "xserver-xf86-dri-lite \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-input-evdev \ + xf86-input-synaptics \ + xf86-video-vesa" + +SERIAL_CONSOLE = "115200 ttyS0" + +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" + +IMAGE_FSTYPES ?= "ext3 cpio.gz live" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index a8715294..4b81fab0 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -24,7 +24,10 @@ XSERVER ?= "xserver-xf86-dri-lite \ xf86-input-keyboard \ xf86-input-evdev \ xf86-input-synaptics \ - xf86-video-vesa" + emgd-driver-bin" + +PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" +PREFERRED_VERSION_emgd-driver-bin ?= "1.8" SERIAL_CONSOLE = "115200 ttyS0" -- cgit v1.2.3-54-g00ecf