diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2013-09-04 21:20:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-06 23:18:34 +0100 |
| commit | 310f89aee4d09174fa3cb0cd1082241f97de97d3 (patch) | |
| tree | f32cb49fe830d5270fc71a0f98a531774390fb7d /meta-yocto-bsp | |
| parent | 82ddcb1ef56d364512515c347baa1c5bd74d483f (diff) | |
| download | ast2050-yocto-poky-310f89aee4d09174fa3cb0cd1082241f97de97d3.zip ast2050-yocto-poky-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.conf | 29 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/genericx86.conf | 31 | ||||
| -rw-r--r-- | meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 20 |
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 @@ #@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. include conf/machine/include/tune-x86_64.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa efi pcbios" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.10%" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-glx \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-fbdev \ - xf86-video-modesetting \ - xf86-video-vesa \ - xf86-video-intel \ - mesa-driver-i915 \ - mesa-driver-i965" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" +include conf/machine/include/genericx86-common.inc 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 @@ #@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. include conf/machine/include/tune-atom.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.10%" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-glx \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-fbdev \ - xf86-video-modesetting \ - xf86-video-vesa \ - xf86-video-intel \ - mesa-driver-i915 \ - mesa-driver-i965" - -#MACHINE_EXTRA_RDEPENDS = "rt2860" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" +include conf/machine/include/genericx86-common.inc 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 @@ +include conf/machine/include/ia32-base.inc +MACHINE_FEATURES += "wifi efi pcbios" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" +PREFERRED_VERSION_linux-yocto ?= "3.10%" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_I915} \ + ${XSERVER_IA32_I965} \ + ${XSERVER_IA32_FBDEV} \ + ${XSERVER_IA32_VESA} \ + ${XSERVER_IA32_MODESETTING} \ + " + +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d" + +GLIBC_ADDONS = "nptl" + +EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" |
