sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Darren Hart 2013-09-04 21:20:55 +00:00 committed by Richard Purdie
parent 82ddcb1ef5
commit 310f89aee4
3 changed files with 22 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-yocto-bsp/conf/machine/genericx86-64.conf
View File

@ -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

31
meta-yocto-bsp/conf/machine/genericx86.conf
View File

@ -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

20
meta-yocto-bsp/conf/machine/include/genericx86-common.inc Normal file
View File

@ -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"