summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-11-16 04:59:14 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-11-21 15:30:00 (GMT)
commit33667aa9ef5e46b2699fcc728d98d66b76c530a2 (patch)
treed14131e9b8e22134a1fea1d39df4f37e6d81f72b
parent6f65f6e44b48adc43c299c0d5927eadcfea748f4 (diff)
downloadmeta-intel-33667aa9ef5e46b2699fcc728d98d66b76c530a2.tar.gz
Have romley.conf use the common ia32-base .inc file and remove the
open-coded machine settings. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-romley/conf/machine/romley.conf39
1 files changed, 4 insertions, 35 deletions
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
index 3d41db5..7b6014c 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -5,41 +5,10 @@
5# i.e. Sandy Bridge + Patsburg Chipset 5# i.e. Sandy Bridge + Patsburg Chipset
6 6
7require conf/machine/include/tune-x86_64.inc 7require conf/machine/include/tune-x86_64.inc
8include conf/machine/include/ia32-base.inc
8 9
9MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ 10XSERVER ?= "${XSERVER_IA32_BASE} \
10 acpi serial usbgadget" 11 ${XSERVER_IA32_EXT} \
11
12KERNEL_IMAGETYPE = "bzImage"
13
14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0%"
16
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
21XSERVER ?= "xserver-xorg \
22 xserver-xorg-extension-dri \
23 xserver-xorg-extension-dri2 \
24 xserver-xorg-extension-glx \
25 xserver-xorg-extension-extmod \
26 xserver-xorg-extension-dbe \
27 xserver-xorg-module-libint10 \
28 xserver-xorg-module-xaa \ 12 xserver-xorg-module-xaa \
29 xf86-input-mouse \
30 xf86-input-keyboard \
31 xf86-input-evdev \
32 xf86-input-synaptics \
33 xf86-video-mga \ 13 xf86-video-mga \
34 mesa-dri" 14 "
35
36SERIAL_CONSOLE = "115200 ttyS0"
37
38MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
39
40IMAGE_FSTYPES ?= "ext3 cpio.gz live"
41
42GLIBC_ADDONS = "nptl"
43GLIBC_EXTRA_OECONF = "--with-tls"
44
45MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"