diff options
author | Kishore Bodke <kishore.k.bodke@intel.com> | 2012-04-10 11:15:39 -0700 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2012-04-12 09:06:51 -0500 |
commit | 9bb6e5047d177d18d03220895ad506d0934869dd (patch) | |
tree | 0b2ffd800ae4ad82d25bd2ebfd80139044be5b56 /meta-cedartrail/conf/machine | |
parent | b669b9363197a6af2014c5d54b2c651894e62a5e (diff) | |
download | meta-intel-9bb6e5047d177d18d03220895ad506d0934869dd.tar.gz |
Cedartrail: Split machine.conf
Have two machine.conf files.
One for pvr and the other for no-pvr.
PVR machine.conf has the both pcbios and efi support.
no-pvr has only pcbios support.
Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-cedartrail/conf/machine')
-rw-r--r-- | meta-cedartrail/conf/machine/cedartrail-nopvr.conf | 19 | ||||
-rw-r--r-- | meta-cedartrail/conf/machine/cedartrail.conf | 10 |
2 files changed, 27 insertions, 2 deletions
diff --git a/meta-cedartrail/conf/machine/cedartrail-nopvr.conf b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf new file mode 100644 index 00000000..767137e6 --- /dev/null +++ b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf | |||
@@ -0,0 +1,19 @@ | |||
1 | #@TYPE: Machine | ||
2 | #@NAME: Cedartrail | ||
3 | |||
4 | #@DESCRIPTION: Machine configuration for Cedartrail systems | ||
5 | # i.e. Cedarview processor + Tiger Point Chipset | ||
6 | |||
7 | require conf/machine/include/tune-atom.inc | ||
8 | require conf/machine/include/ia32-base.inc | ||
9 | |||
10 | XSERVER ?= "${XSERVER_IA32_BASE} \ | ||
11 | ${XSERVER_IA32_EXT} \ | ||
12 | ${XSERVER_IA32_VESA} \ | ||
13 | " | ||
14 | |||
15 | SYSLINUX_OPTS = "serial 0 115200" | ||
16 | SERIAL_CONSOLE = "115200 ttyS0" | ||
17 | APPEND += "console=ttyS0,115200 console=tty0" | ||
18 | APPEND += "video=vesafb vga=0x318" | ||
19 | |||
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf index 3bd5cf88..4d77b042 100644 --- a/meta-cedartrail/conf/machine/cedartrail.conf +++ b/meta-cedartrail/conf/machine/cedartrail.conf | |||
@@ -7,9 +7,15 @@ | |||
7 | require conf/machine/include/tune-atom.inc | 7 | require conf/machine/include/tune-atom.inc |
8 | require conf/machine/include/ia32-base.inc | 8 | require conf/machine/include/ia32-base.inc |
9 | 9 | ||
10 | MACHINE_FEATURES += "pcbios efi" | ||
11 | |||
10 | XSERVER ?= "${XSERVER_IA32_BASE} \ | 12 | XSERVER ?= "${XSERVER_IA32_BASE} \ |
11 | ${XSERVER_IA32_EXT} \ | 13 | ${XSERVER_IA32_EXT} \ |
12 | ${XSERVER_IA32_VESA} \ | 14 | cdv-pvr-driver \ |
13 | " | 15 | " |
16 | PREFERRED_VERSION_xserver-xorg ?= "1.9.3" | ||
17 | PREFERRED_VERSION_mesa-dri ?= "7.11" | ||
14 | 18 | ||
15 | APPEND += "video=vesafb vga=0x318" | 19 | SYSLINUX_OPTS = "serial 0 115200" |
20 | SERIAL_CONSOLE = "115200 ttyS0" | ||
21 | APPEND += "console=ttyS0,115200 console=tty0" | ||