yocto-bsp: upgrade i386 template with emgd 1.16
Along with related changes. (From meta-yocto rev: 6e93c881e2323b57f5b102db3b2b54220a06a1b6) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
04d15f567d
commit
6911fd0889
|
@ -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
|
NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin
|
||||||
package (i.e. if the emgd version of the xserver is being used), it
|
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
|
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:
|
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
|
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
|
you can boot from a USB flash drive (see instructions on how to do
|
||||||
|
|
|
@ -58,8 +58,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
|
||||||
|
|
||||||
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
|
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
|
||||||
PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
|
PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
|
||||||
PREFERRED_VERSION_mesa-dri ?= "7.11"
|
PREFERRED_VERSION_mesa-dri ?= "9.0.2"
|
||||||
PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
|
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": }}
|
{{ 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"
|
||||||
|
|
|
@ -7,8 +7,7 @@ include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)
|
||||||
branch {{=machine}}
|
branch {{=machine}}
|
||||||
|
|
||||||
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
|
{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
|
||||||
include features/emgd/emgd-1.14.scc
|
include features/drm-emgd/emgd-1.16.scc
|
||||||
git merge emgd-1.14
|
|
||||||
|
|
||||||
include {{=machine}}.scc
|
include {{=machine}}.scc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue