meta-intel: machine config cleanup
cover meta-intel: machine config cleanup
From: Tom Zanussi <[email protected]>
This patchset cleans up the BSPs in meta-intel by having them uses the new ia32-base.inc file containing common BSP settings.
The following BSPs were build- and boot-tested: sugarbay, crownbay, crownbay-noemgd, emenlow, and n450. These represent all the main variations and all were verified to work the same before as after. This includes the n450, which wasn't able to start X either before or after.
The other BSPs are the same or similar to those tested, so shouldn't see any changes either, but will have to be tested later.
The following changes since commit 2a41ae377613b1f14829179f437aa76bbb1bc39e:
Tom Zanussi (1):
meta-intel: update kernel SRCREVs
are available in the git repository at:
git://git.yoctoproject.org/meta-intel.git tzanussi/conf-cleanup-v0
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/conf-cleanup-v0
Tom Zanussi (11):
meta-intel: remove virtual/xserver-xf86 references
Have sugarbay.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have fishriver.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have crownbay.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have crownbay-noemgd.conf use the common ia32-base .inc file and
remove the open-coded machine settings.
Have fri2.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have fri2-noemgd.conf use the common ia32-base .inc file and
remove the open-coded machine settings.
Have jasperforest.conf use the common ia32-base .inc file and
remove the open-coded machine settings.
Have n450.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have romley.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
Have emenlow.conf use the common ia32-base .inc file and remove the
open-coded machine settings.
meta-crownbay/conf/machine/crownbay-noemgd.conf | 43 +++------------------- meta-crownbay/conf/machine/crownbay.conf | 43 +++------------------- meta-emenlow/conf/machine/emenlow.conf | 22 +----------- meta-fishriver/conf/machine/fishriver.conf | 42 +++------------------- meta-fri2/conf/machine/fri2-noemgd.conf | 43 +++------------------- meta-fri2/conf/machine/fri2.conf | 43 ++++------------------ meta-jasperforest/conf/machine/jasperforest.conf | 42 +++------------------- meta-n450/conf/machine/n450.conf | 40 +++----------------- meta-romley/conf/machine/romley.conf | 40 ++------------------ meta-sugarbay/conf/machine/sugarbay.conf | 43 +++------------------- 10 files changed, 50 insertions(+), 351 deletions(-)
PATCH 1/11 meta-intel: remove virtual/xserver-xf86 references
From: Tom Zanussi <[email protected]>
These are now deprecated (in favor of just virtual/xserver), so remove them.
Signed-off-by Tom Zanussi <[email protected]>
--- meta-crownbay/conf/machine/crownbay-noemgd.conf | 1 - meta-crownbay/conf/machine/crownbay.conf | 1 - meta-emenlow/conf/machine/emenlow.conf | 1 - meta-fishriver/conf/machine/fishriver.conf | 1 - meta-fri2/conf/machine/fri2-noemgd.conf | 1 - meta-fri2/conf/machine/fri2.conf | 1 - meta-jasperforest/conf/machine/jasperforest.conf | 1 - meta-n450/conf/machine/n450.conf | 1 - meta-romley/conf/machine/romley.conf | 1 - meta-sugarbay/conf/machine/sugarbay.conf | 1 - 10 files changed, 0 insertions(+), 10 deletions(-)
meta-crownbay/conf/machine/crownbay-noemgd.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-crownbay/conf/machine/crownbay.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-emenlow/conf/machine/emenlow.conf +0 -1
@@ -20,7 +20,6 @@ PREFERRED_PROVIDER_drm = "libdrm-poulsbo" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" -PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" XSERVER ?= "xserver-psb \ xserver-psb-extension-dri \
meta-fishriver/conf/machine/fishriver.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-fri2/conf/machine/fri2-noemgd.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-fri2/conf/machine/fri2.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-jasperforest/conf/machine/jasperforest.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-n450/conf/machine/n450.conf +0 -1
@@ -16,7 +16,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-romley/conf/machine/romley.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
meta-sugarbay/conf/machine/sugarbay.conf +0 -1
@@ -18,7 +18,6 @@ PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \
Signature · 1 line
1.7.0.4
PATCH 2/11 Have sugarbay.conf use the common ia32-base .inc file and remove the open-coded machine settings.
From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-sugarbay/conf/machine/sugarbay.conf | 42 +++-------------------------- 1 files changed, 5 insertions(+), 37 deletions(-)
meta-sugarbay/conf/machine/sugarbay.conf +5 -37
@@ -5,41 +5,9 @@ # i.e. Sandy Bridge + Cougar Point require conf/machine/include/tune-x86_64.inc +require conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-intel \ - mesa-dri \ - mesa-dri-driver-i965" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_I915} \ + "
Signature · 1 line
1.7.0.4
PATCH 3/11 Have fishriver.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-fishriver/conf/machine/fishriver.conf | 41 +++------------------------ 1 files changed, 5 insertions(+), 36 deletions(-)
meta-fishriver/conf/machine/fishriver.conf +5 -36
@@ -5,42 +5,11 @@ # i.e. Z530/E660 + EG20T include conf/machine/include/tune-atom.inc +require conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-vesa" - -SERIAL_CONSOLE = "115200 ttyS0" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_VESA} \ + " APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" -
Signature · 1 line
1.7.0.4
PATCH 4/11 Have crownbay.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-crownbay/conf/machine/crownbay.conf | 42 ++++------------------------- 1 files changed, 6 insertions(+), 36 deletions(-)
meta-crownbay/conf/machine/crownbay.conf +6 -36
@@ -5,45 +5,15 @@ # i.e. E660 + EG20T include conf/machine/include/tune-atom.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - emgd-driver-bin \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-vesa" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_EMGD} \ + " PREFERRED_VERSION_xserver-xorg ?= "1.9.3" +PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_emgd-driver-bin ?= "1.8" -SERIAL_CONSOLE = "115200 ttyS0" - APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
Signature · 1 line
1.7.0.4
PATCH 5/11 Have crownbay-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-crownbay/conf/machine/crownbay-noemgd.conf | 42 +++-------------------- 1 files changed, 5 insertions(+), 37 deletions(-)
meta-crownbay/conf/machine/crownbay-noemgd.conf +5 -37
@@ -5,43 +5,11 @@ # i.e. E660 + EG20T include conf/machine/include/tune-atom.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-vesa" - -PREFERRED_VERSION_xserver-xorg ?= "1.11.1" - -SERIAL_CONSOLE = "115200 ttyS0" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_VESA} \ + " APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
Signature · 1 line
1.7.0.4
PATCH 6/11 Have fri2.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-fri2/conf/machine/fri2.conf | 42 ++++++------------------------------- 1 files changed, 7 insertions(+), 35 deletions(-)
meta-fri2/conf/machine/fri2.conf +7 -35
@@ -5,45 +5,17 @@ # i.e. E660 + EG20T include conf/machine/include/tune-atom.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget wifi 3g" +MACHINE_FEATURES += "wifi 3g" -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - emgd-driver-bin" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_EMGD} \ + " PREFERRED_VERSION_xserver-xorg ?= "1.9.3" +PREFERRED_VERSION_mesa-dri ?= "7.11" PREFERRED_VERSION_emgd-driver-bin ?= "1.8" -SERIAL_CONSOLE = "115200 ttyS0" - APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" -
Signature · 1 line
1.7.0.4
PATCH 7/11 Have fri2-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-fri2/conf/machine/fri2-noemgd.conf | 42 ++++-------------------------- 1 files changed, 6 insertions(+), 36 deletions(-)
meta-fri2/conf/machine/fri2-noemgd.conf +6 -36
@@ -5,43 +5,13 @@ # i.e. E660 + EG20T include conf/machine/include/tune-atom.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget wifi 3g" +MACHINE_FEATURES += "wifi 3g" -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-vesa" - -PREFERRED_VERSION_xserver-xorg ?= "1.11.1" - -SERIAL_CONSOLE = "115200 ttyS0" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_VESA} \ + " APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
Signature · 1 line
1.7.0.4
PATCH 8/11 Have jasperforest.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-jasperforest/conf/machine/jasperforest.conf | 41 +++------------------- 1 files changed, 5 insertions(+), 36 deletions(-)
meta-jasperforest/conf/machine/jasperforest.conf +5 -36
@@ -5,42 +5,11 @@ # systems i.e. Xeon C5500/C3500 + Intel 3420 chipset (Ibex Peak) require conf/machine/include/tune-x86_64.inc +require conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-vesa" - -SERIAL_CONSOLE = "115200 ttyS0" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_VESA} \ + " APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" -
Signature · 1 line
1.7.0.4
PATCH 9/11 Have n450.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-n450/conf/machine/n450.conf | 39 +++++-------------------------------- 1 files changed, 6 insertions(+), 33 deletions(-)
meta-n450/conf/machine/n450.conf +6 -33
@@ -4,44 +4,17 @@ #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems include conf/machine/include/tune-atom.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.0%" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-intel \ - mesa-dri-driver-i915" +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ + ${XSERVER_IA32_I915} \ + " SYSLINUX_OPTS = "serial 0 115200" SERIAL_CONSOLE = "115200 ttyS0" APPEND += "console=ttyS0,115200 console=tty0" -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts n450-audio" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" +MACHINE_EXTRA_RRECOMMENDS += "n450-audio" ROOTLESS_X = "1" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" -
Signature · 1 line
1.7.0.4
PATCH 10/11 Have romley.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-romley/conf/machine/romley.conf | 39 +++------------------------------ 1 files changed, 4 insertions(+), 35 deletions(-)
meta-romley/conf/machine/romley.conf +4 -35
@@ -5,41 +5,10 @@ # i.e. Sandy Bridge + Patsburg Chipset require conf/machine/include/tune-x86_64.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto = "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx \ - xserver-xorg-extension-extmod \ - xserver-xorg-extension-dbe \ - xserver-xorg-module-libint10 \ +XSERVER ?= "${XSERVER_IA32_BASE} \ + ${XSERVER_IA32_EXT} \ xserver-xorg-module-xaa \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ xf86-video-mga \ - mesa-dri" - -SERIAL_CONSOLE = "115200 ttyS0" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" + "
Signature · 1 line
1.7.0.4
PATCH 11/11 Have emenlow.conf use the common ia32-base .inc file and remove the open-coded machine settings.
In reply to [email protected]From: Tom Zanussi <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
--- meta-emenlow/conf/machine/emenlow.conf | 23 ++--------------------- 1 files changed, 2 insertions(+), 21 deletions(-)
meta-emenlow/conf/machine/emenlow.conf +2 -21
@@ -5,21 +5,14 @@ # Webs-2120 box. include conf/machine/include/tune-atom.inc +include conf/machine/include/ia32-base.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ - acpi serial usbgadget" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.0%" - -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" PREFERRED_PROVIDER_drm = "libdrm-poulsbo" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" +PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" XSERVER ?= "xserver-psb \ xserver-psb-extension-dri \
@@ -32,16 +25,4 @@ XSERVER ?= "xserver-psb \ xf86-input-keyboard \ xf86-input-evdev" -SERIAL_CONSOLE = "115200 ttyS0" - APPEND += "video=vesafb vga=0x318" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" - -MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" -
Signature · 1 line
1.7.0.4