summaryrefslogtreecommitdiffstats
path: root/meta-yocto-bsp
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-09-04 21:20:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-06 22:18:34 (GMT)
commit310f89aee4d09174fa3cb0cd1082241f97de97d3 (patch)
treef32cb49fe830d5270fc71a0f98a531774390fb7d /meta-yocto-bsp
parent82ddcb1ef56d364512515c347baa1c5bd74d483f (diff)
downloadpoky-310f89aee4d09174fa3cb0cd1082241f97de97d3.tar.gz
genericx86: Create a genericx86-common.inc base for the x86 BSPs
The genericx86 and genericx86-64 machines share a great deal in common in terms of machine features, required packages, etc. Use a common include file to simplify changes to both machine definitions and avoid accidental omissions. Replace the hard-coded XSERVER assignment with the XSERVER_IA32* defines from ia32-base.inc. (From meta-yocto rev: c70ee30da060173f51e8dba72069052ecff389b5) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Ross Burton <ross.burton@intel.com> Cc: yunguo.wei@windriver.com Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
-rw-r--r--meta-yocto-bsp/conf/machine/genericx86-64.conf29
-rw-r--r--meta-yocto-bsp/conf/machine/genericx86.conf31
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc20
3 files changed, 22 insertions, 58 deletions
diff --git a/meta-yocto-bsp/conf/machine/genericx86-64.conf b/meta-yocto-bsp/conf/machine/genericx86-64.conf
index 7825bae..56e9bb6 100644
--- a/meta-yocto-bsp/conf/machine/genericx86-64.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86-64.conf
@@ -4,31 +4,4 @@
4#@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. 4#@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
5 5
6include conf/machine/include/tune-x86_64.inc 6include conf/machine/include/tune-x86_64.inc
7 7include conf/machine/include/genericx86-common.inc
8MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa efi pcbios"
9
10KERNEL_IMAGETYPE = "bzImage"
11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.10%"
14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
15XSERVER ?= "xserver-xorg \
16 xserver-xorg-extension-glx \
17 xf86-input-mouse \
18 xf86-input-keyboard \
19 xf86-input-evdev \
20 xf86-input-synaptics \
21 xf86-video-fbdev \
22 xf86-video-modesetting \
23 xf86-video-vesa \
24 xf86-video-intel \
25 mesa-driver-i915 \
26 mesa-driver-i965"
27
28MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d"
29
30IMAGE_FSTYPES ?= "ext3 cpio.gz live"
31
32GLIBC_ADDONS = "nptl"
33
34EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index ff5cbc9..9d29f62 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -4,33 +4,4 @@
4#@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware. 4#@DESCRIPTION: Machine configuration for generic X86 (32-bit) PCs. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
5 5
6include conf/machine/include/tune-atom.inc 6include conf/machine/include/tune-atom.inc
7 7include conf/machine/include/genericx86-common.inc
8MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa"
9
10KERNEL_IMAGETYPE = "bzImage"
11
12PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
13PREFERRED_VERSION_linux-yocto ?= "3.10%"
14PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
15XSERVER ?= "xserver-xorg \
16 xserver-xorg-extension-glx \
17 xf86-input-mouse \
18 xf86-input-keyboard \
19 xf86-input-evdev \
20 xf86-input-synaptics \
21 xf86-video-fbdev \
22 xf86-video-modesetting \
23 xf86-video-vesa \
24 xf86-video-intel \
25 mesa-driver-i915 \
26 mesa-driver-i965"
27
28#MACHINE_EXTRA_RDEPENDS = "rt2860"
29
30MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d"
31
32IMAGE_FSTYPES ?= "ext3 cpio.gz live"
33
34GLIBC_ADDONS = "nptl"
35
36EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
new file mode 100644
index 0000000..67a880f
--- /dev/null
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -0,0 +1,20 @@
1include conf/machine/include/ia32-base.inc
2MACHINE_FEATURES += "wifi efi pcbios"
3
4PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
5PREFERRED_VERSION_linux-yocto ?= "3.10%"
6PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
7XSERVER ?= "${XSERVER_IA32_BASE} \
8 ${XSERVER_IA32_EXT} \
9 ${XSERVER_IA32_I915} \
10 ${XSERVER_IA32_I965} \
11 ${XSERVER_IA32_FBDEV} \
12 ${XSERVER_IA32_VESA} \
13 ${XSERVER_IA32_MODESETTING} \
14 "
15
16MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d"
17
18GLIBC_ADDONS = "nptl"
19
20EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"