summaryrefslogtreecommitdiffstats
path: root/meta-sys940x/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-sys940x/conf/machine')
-rw-r--r--meta-sys940x/conf/machine/sys940x-noemgd.conf9
-rw-r--r--meta-sys940x/conf/machine/sys940x.conf9
2 files changed, 8 insertions, 10 deletions
diff --git a/meta-sys940x/conf/machine/sys940x-noemgd.conf b/meta-sys940x/conf/machine/sys940x-noemgd.conf
index 7e58655f..ed6c7f49 100644
--- a/meta-sys940x/conf/machine/sys940x-noemgd.conf
+++ b/meta-sys940x/conf/machine/sys940x-noemgd.conf
@@ -5,17 +5,16 @@
5 5
6#@DESCRIPTION: Machine configuration for Inforce SYS940X systems, without Intel-proprietary graphics bits 6#@DESCRIPTION: Machine configuration for Inforce SYS940X systems, without Intel-proprietary graphics bits
7 7
8require conf/machine/include/tune-atom.inc 8require conf/machine/include/intel-core2-32-common.inc
9require conf/machine/include/ia32-base.inc
10 9
11# 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
12MACHINE_FEATURES += "efi pcbios" 11MACHINE_FEATURES += "efi pcbios"
13 12
14PREFERRED_VERSION_linux-yocto ?= "3.10%" 13PREFERRED_VERSION_linux-yocto ?= "3.10%"
15 14
16XSERVER ?= "${XSERVER_IA32_BASE} \ 15XSERVER ?= "${XSERVER_X86_BASE} \
17 ${XSERVER_IA32_EXT} \ 16 ${XSERVER_X86_EXT} \
18 ${XSERVER_IA32_VESA} \ 17 ${XSERVER_X86_VESA} \
19 " 18 "
20 19
21SERIAL_CONSOLE = "115200 ttyS0" 20SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
index db2d07a8..04e77665 100644
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ b/meta-sys940x/conf/machine/sys940x.conf
@@ -5,8 +5,7 @@
5 5
6#@DESCRIPTION: Machine configuration for Inforce SYS940x systems 6#@DESCRIPTION: Machine configuration for Inforce SYS940x systems
7 7
8require conf/machine/include/tune-atom.inc 8require conf/machine/include/intel-core2-32-common.inc
9require conf/machine/include/ia32-base.inc
10require conf/machine/include/meta-intel.inc 9require conf/machine/include/meta-intel.inc
11require conf/machine/include/meta-intel-emgd.inc 10require conf/machine/include/meta-intel-emgd.inc
12 11
@@ -19,9 +18,9 @@ MACHINE_HWCODECS ?= "va-intel"
19XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \ 18XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
20 emgd-gst-plugins-mixvideo gst-va-intel" 19 emgd-gst-plugins-mixvideo gst-va-intel"
21 20
22XSERVER ?= "${XSERVER_IA32_BASE} \ 21XSERVER ?= "${XSERVER_X86_BASE} \
23 ${XSERVER_IA32_EXT} \ 22 ${XSERVER_X86_EXT} \
24 ${XSERVER_IA32_EMGD} \ 23 ${XSERVER_X86_EMGD} \
25 " 24 "
26 25
27PREFERRED_VERSION_xserver-xorg ?= "1.9.3" 26PREFERRED_VERSION_xserver-xorg ?= "1.9.3"