From 6911fd0889261fb173775727db61dffaac355ed7 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 11 Mar 2013 00:37:06 -0500 Subject: yocto-bsp: upgrade i386 template with emgd 1.16 Along with related changes. (From meta-yocto rev: 6e93c881e2323b57f5b102db3b2b54220a06a1b6) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/bsp/substrate/target/arch/common/README | 4 ++-- .../bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf | 7 ++++--- .../{{=machine}}-standard.scc" | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/bsp/substrate/target/arch/common/README b/scripts/lib/bsp/substrate/target/arch/common/README index 228c0e2e9d..93af973740 100644 --- a/scripts/lib/bsp/substrate/target/arch/common/README +++ b/scripts/lib/bsp/substrate/target/arch/common/README @@ -68,10 +68,10 @@ You should then be able to build a {{=machine}} image as such: NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin package (i.e. if the emgd version of the xserver is being used), it has a proprietary license that must be whitelisted by adding the -string "license_emgd-driver-bin_1.14" to the LICENSE_FLAGS_WHITELIST +string "license_emgd-driver-bin_1.16" to the LICENSE_FLAGS_WHITELIST variable in your local.conf. For example: - LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14" + LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16" At the end of a successful build, you should have a live image that you can boot from a USB flash drive (see instructions on how to do diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf index a33cb2edb3..268ddc82d4 100644 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf @@ -58,8 +58,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \ {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} PREFERRED_VERSION_xserver-xorg ?= "1.9.3" -PREFERRED_VERSION_mesa-dri ?= "7.11" -PREFERRED_VERSION_emgd-driver-bin ?= "1.14" +PREFERRED_VERSION_mesa-dri ?= "9.0.2" +PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" +PREFERRED_VERSION_emgd-driver-bin ?= "1.16" {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} -APPEND += "video=vesafb vga=0x318" +APPEND += "video=vesafb vga=0x318 vmalloc=256MB" diff --git "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" index e34882f93d..1b22eab9ad 100644 --- "a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" @@ -7,8 +7,7 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch) branch {{=machine}} {{ if xserver == "y" and xserver_choice == "xserver_emgd": }} -include features/emgd/emgd-1.14.scc -git merge emgd-1.14 +include features/drm-emgd/emgd-1.16.scc include {{=machine}}.scc -- cgit v1.2.3-54-g00ecf