summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-03-11 05:37:06 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-17 23:10:28 (GMT)
commit6911fd0889261fb173775727db61dffaac355ed7 (patch)
tree85b899adba9b1efe3554811b6ba2a0ddd36839f7 /scripts/lib
parent04d15f567d0493654df519f404f564e2591e9453 (diff)
downloadpoky-6911fd0889261fb173775727db61dffaac355ed7.tar.gz
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/README4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf7
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}-standard.scc3
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/common/README b/scripts/lib/bsp/substrate/target/arch/common/README
index 228c0e2..93af973 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:
68NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin 68NOTE: if the '{{=machine}}' machine includes the emgd-driver-bin
69package (i.e. if the emgd version of the xserver is being used), it 69package (i.e. if the emgd version of the xserver is being used), it
70has a proprietary license that must be whitelisted by adding the 70has a proprietary license that must be whitelisted by adding the
71string "license_emgd-driver-bin_1.14" to the LICENSE_FLAGS_WHITELIST 71string "license_emgd-driver-bin_1.16" to the LICENSE_FLAGS_WHITELIST
72variable in your local.conf. For example: 72variable in your local.conf. For example:
73 73
74 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14" 74 LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.16"
75 75
76At the end of a successful build, you should have a live image that 76At the end of a successful build, you should have a live image that
77you can boot from a USB flash drive (see instructions on how to do 77you 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 a33cb2e..268ddc8 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} \
58 58
59{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} 59{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
60PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 60PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
61PREFERRED_VERSION_mesa-dri ?= "7.11" 61PREFERRED_VERSION_mesa-dri ?= "9.0.2"
62PREFERRED_VERSION_emgd-driver-bin ?= "1.14" 62PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
63PREFERRED_VERSION_emgd-driver-bin ?= "1.16"
63 64
64{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} 65{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
65APPEND += "video=vesafb vga=0x318" 66APPEND += "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 e34882f..1b22eab 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)
7branch {{=machine}} 7branch {{=machine}}
8 8
9{{ if xserver == "y" and xserver_choice == "xserver_emgd": }} 9{{ if xserver == "y" and xserver_choice == "xserver_emgd": }}
10include features/emgd/emgd-1.14.scc 10include features/drm-emgd/emgd-1.16.scc
11git merge emgd-1.14
12 11
13include {{=machine}}.scc 12include {{=machine}}.scc
14 13