summaryrefslogtreecommitdiffstats
path: root/meta-sys940x/conf/machine
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-09-24 17:35:59 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2012-09-24 19:52:21 (GMT)
commit102814d8ba2735d1e24c75b297508f863da9915e (patch)
tree126391c78f689d6a42ecab828470b03bf2578877 /meta-sys940x/conf/machine
parent1cd94a80c8481593f636076f55c89b1739ce46e2 (diff)
downloadmeta-intel-102814d8ba2735d1e24c75b297508f863da9915e.tar.gz
sys940x: Update to Linux 3.4 and EMGD 1.14
Update the sys940x machines to use linux-yocto 3.4 and EMGD 1.14. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-sys940x/conf/machine')
-rw-r--r--meta-sys940x/conf/machine/sys940x-noemgd.conf4
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf8
2 files changed, 6 insertions, 6 deletions
diff --git a/meta-sys940x/conf/machine/sys940x-noemgd.conf b/meta-sys940x/conf/machine/sys940x-noemgd.conf
index 23ec0bc..0c04dcd 100644
--- a/meta-sys940x/conf/machine/sys940x-noemgd.conf
+++ b/meta-sys940x/conf/machine/sys940x-noemgd.conf
@@ -1,5 +1,5 @@
1#@TYPE: Machine 1#@TYPE: Machine
2#@NAME: sys940x 2#@NAME: sys940x-noemgd
3 3
4#@DESCRIPTION: Machine configuration for Inforce SYS940X systems 4#@DESCRIPTION: Machine configuration for Inforce SYS940X systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T
@@ -10,7 +10,7 @@ require conf/machine/include/ia32-base.inc
10# Add "pcbios" if you have a non-efi version of the firmware 10# Add "pcbios" if you have a non-efi version of the firmware
11MACHINE_FEATURES += "efi pcbios" 11MACHINE_FEATURES += "efi pcbios"
12 12
13PREFERRED_VERSION_linux-yocto ?= "3.2%" 13PREFERRED_VERSION_linux-yocto ?= "3.4%"
14 14
15XSERVER ?= "${XSERVER_IA32_BASE} \ 15XSERVER ?= "${XSERVER_IA32_BASE} \
16 ${XSERVER_IA32_EXT} \ 16 ${XSERVER_IA32_EXT} \
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index 46c4315..bdd655f 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -2,7 +2,7 @@
2#@NAME: sys940x 2#@NAME: sys940x
3 3
4#@DESCRIPTION: Machine configuration for Inforce SYS940x systems 4#@DESCRIPTION: Machine configuration for Inforce SYS940x systems
5# i.e. E660 + EG20T 5# i.e. E660 + EG20T + emgd
6 6
7require conf/machine/include/tune-atom.inc 7require conf/machine/include/tune-atom.inc
8require conf/machine/include/ia32-base.inc 8require conf/machine/include/ia32-base.inc
@@ -11,7 +11,7 @@ require conf/machine/include/meta-intel.inc
11# Add "pcbios" if you have a non-efi version of the firmware 11# Add "pcbios" if you have a non-efi version of the firmware
12MACHINE_FEATURES += "efi pcbios gst-va-mixvideo" 12MACHINE_FEATURES += "efi pcbios gst-va-mixvideo"
13 13
14PREFERRED_VERSION_linux-yocto ?= "3.2%" 14PREFERRED_VERSION_linux-yocto ?= "3.4%"
15 15
16XSERVER ?= "${XSERVER_IA32_BASE} \ 16XSERVER ?= "${XSERVER_IA32_BASE} \
17 ${XSERVER_IA32_EXT} \ 17 ${XSERVER_IA32_EXT} \
@@ -19,9 +19,9 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
19 " 19 "
20 20
21PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 21PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
22PREFERRED_VERSION_mesa-dri ?= "7.11" 22PREFERRED_VERSION_mesa-dri ?= "8.0.4"
23PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0" 23PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
24PREFERRED_VERSION_emgd-driver-bin ?= "1.10" 24PREFERRED_VERSION_emgd-driver-bin ?= "1.14"
25 25
26SERIAL_CONSOLE = "115200 ttyS0" 26SERIAL_CONSOLE = "115200 ttyS0"
27APPEND += "console=ttyS0,115200 console=tty0" 27APPEND += "console=ttyS0,115200 console=tty0"