* [PATCH 01/11] meta-intel: remove virtual/xserver-xf86 references
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 02/11] Have sugarbay.conf use the common ia32-base .inc file and remove the open-coded machine settings tom.zanussi
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
These are now deprecated (in favor of just virtual/xserver), so remove
them.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
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(-)
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index f61c75a..aa9e732 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -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 \
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index defa4e5..9315e82 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -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 \
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 774ef08..06cba37 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -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 \
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 79bf349..8cc43f8 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -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 \
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index 089861f..d70e06f 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -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 \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 6029cee..80fa43b 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -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 \
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index 17468de..c668c64 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -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 \
diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf
index 431a6c5..b28f57f 100644
--- a/meta-n450/conf/machine/n450.conf
+++ b/meta-n450/conf/machine/n450.conf
@@ -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 \
diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf
index 2dcb5db..3d41db5 100644
--- a/meta-romley/conf/machine/romley.conf
+++ b/meta-romley/conf/machine/romley.conf
@@ -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 \
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 3ea9ca3..0b4541f 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -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 \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 02/11] Have sugarbay.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
2011-11-18 16:59 ` [PATCH 01/11] meta-intel: remove virtual/xserver-xf86 references tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 03/11] Have fishriver.conf " tom.zanussi
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-sugarbay/conf/machine/sugarbay.conf | 42 +++--------------------------
1 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 0b4541f..25b3aad 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -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} \
+ "
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 03/11] Have fishriver.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
2011-11-18 16:59 ` [PATCH 01/11] meta-intel: remove virtual/xserver-xf86 references tom.zanussi
2011-11-18 16:59 ` [PATCH 02/11] Have sugarbay.conf use the common ia32-base .inc file and remove the open-coded machine settings tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 04/11] Have crownbay.conf " tom.zanussi
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-fishriver/conf/machine/fishriver.conf | 41 +++------------------------
1 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 8cc43f8..b43282e 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -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"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 04/11] Have crownbay.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (2 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 03/11] Have fishriver.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 05/11] Have crownbay-noemgd.conf " tom.zanussi
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-crownbay/conf/machine/crownbay.conf | 42 ++++-------------------------
1 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 9315e82..a57cc1c 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 05/11] Have crownbay-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (3 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 04/11] Have crownbay.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 06/11] Have fri2.conf " tom.zanussi
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-crownbay/conf/machine/crownbay-noemgd.conf | 42 +++--------------------
1 files changed, 5 insertions(+), 37 deletions(-)
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index aa9e732..80fc2a6 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 06/11] Have fri2.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (4 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 05/11] Have crownbay-noemgd.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 07/11] Have fri2-noemgd.conf " tom.zanussi
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-fri2/conf/machine/fri2.conf | 42 ++++++-------------------------------
1 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 80fa43b..15036a4 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -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"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 07/11] Have fri2-noemgd.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (5 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 06/11] Have fri2.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 08/11] Have jasperforest.conf " tom.zanussi
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-fri2/conf/machine/fri2-noemgd.conf | 42 ++++--------------------------
1 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index d70e06f..1871cad 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 08/11] Have jasperforest.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (6 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 07/11] Have fri2-noemgd.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 09/11] Have n450.conf " tom.zanussi
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-jasperforest/conf/machine/jasperforest.conf | 41 +++-------------------
1 files changed, 5 insertions(+), 36 deletions(-)
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index c668c64..9767010 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -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"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 09/11] Have n450.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (7 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 08/11] Have jasperforest.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 10/11] Have romley.conf " tom.zanussi
2011-11-18 16:59 ` [PATCH 11/11] Have emenlow.conf " tom.zanussi
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-n450/conf/machine/n450.conf | 39 +++++--------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf
index b28f57f..7210da8 100644
--- a/meta-n450/conf/machine/n450.conf
+++ b/meta-n450/conf/machine/n450.conf
@@ -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"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 10/11] Have romley.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (8 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 09/11] Have n450.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
2011-11-18 16:59 ` [PATCH 11/11] Have emenlow.conf " tom.zanussi
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-romley/conf/machine/romley.conf | 39 +++------------------------------
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 @@
# 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"
+ "
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 11/11] Have emenlow.conf use the common ia32-base .inc file and remove the open-coded machine settings.
2011-11-18 16:59 [PATCH 00/11] meta-intel: machine config cleanup tom.zanussi
` (9 preceding siblings ...)
2011-11-18 16:59 ` [PATCH 10/11] Have romley.conf " tom.zanussi
@ 2011-11-18 16:59 ` tom.zanussi
10 siblings, 0 replies; 12+ messages in thread
From: tom.zanussi @ 2011-11-18 16:59 UTC (permalink / raw)
To: yocto, dvhart, kishore.k.bodke
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-emenlow/conf/machine/emenlow.conf | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 06cba37..5a14b26 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -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"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread