[PATCH 0/6] factor out some common meta-intel settings

[PATCH 0/6] factor out some common meta-intel settings

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The meta-intel BSPs have some common settings - this just moves
them out int separate .inc files to simplify them and ease
maintenance.

I compiled and boot-tested into graphics using sato-live images
for each, with the exception of fishriver (I accidentally pulled
out a cable so can't boot into graphics at the moment) and
crownbay-noemgd (same as crownbay, pretty much).

I also didn't touch n450, since it's already factored out and
simplified.

The following changes since commit 92fc07a5f1b98779806cdcc2341487ff5ea5a238:
  Dexuan Cui (1):
        emenlow: fix some .bbappend files' name: poky -> core, etc.

are available in the git repository at:

  git://git.yoctoproject.org/meta-intel.git tzanussi/mach-cleanup
  http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/mach-cleanup

Tom Zanussi (6):
  meta-intel: add a couple common .inc files
  meta-sugarbay: use common .inc files
  meta-crownbay: use common .inc files
  meta-fishriver: use common .inc files
  meta-jasperforest: use common .inc files
  meta-emenlow: use common .inc files

 common/common-bsp-mach.inc                       |   13 +++++++++++++
 common/common-bsp-x.inc                          |    4 ++++
 meta-crownbay/conf/machine/crownbay-noemgd.conf  |   19 ++-----------------
 meta-crownbay/conf/machine/crownbay.conf         |   19 ++-----------------
 meta-emenlow/conf/machine/emenlow.conf           |   17 ++---------------
 meta-fishriver/conf/machine/fishriver.conf       |   20 +++-----------------
 meta-jasperforest/conf/machine/jasperforest.conf |   22 +++-------------------
 meta-sugarbay/conf/machine/sugarbay.conf         |   22 +++-------------------
 8 files changed, 32 insertions(+), 104 deletions(-)
 create mode 100644 common/common-bsp-mach.inc
 create mode 100644 common/common-bsp-x.inc

[PATCH 1/6] meta-intel: add a couple common .inc files

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

The meta-intel BSPs currently have a number of machine settings common
to all - factor these out into a couple common include files.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 common/common-bsp-mach.inc |   13 +++++++++++++
 common/common-bsp-x.inc    |    4 ++++
 2 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 common/common-bsp-mach.inc
 create mode 100644 common/common-bsp-x.inc

diff --git a/common/common-bsp-mach.inc b/common/common-bsp-mach.inc
new file mode 100644
index 0000000..b020a84
--- /dev/null
+++ b/common/common-bsp-mach.inc
@@ -0,0 +1,13 @@
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+                    acpi serial usbgadget"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/common/common-bsp-x.inc b/common/common-bsp-x.inc
new file mode 100644
index 0000000..c012efd
--- /dev/null
+++ b/common/common-bsp-x.inc
@@ -0,0 +1,4 @@
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-- 
1.7.0.4

[PATCH 2/6] meta-sugarbay: use common .inc files

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Have sugarbay.conf use the common-bsp-* .inc files and remove the
open-coded machine settings.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-sugarbay/conf/machine/sugarbay.conf |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index ebc6dbc..ed82506 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -9,18 +9,14 @@ PACKAGE_EXTRA_ARCHS = "x86 snb"
 
 BASE_PACKAGE_ARCH="snb"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
+TARGET_CC_ARCH = "-m64"
 
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
+include ../common/common-bsp-x.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
 XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-mouse \
            xf86-input-keyboard \
@@ -30,17 +26,5 @@ XSERVER ?= "xserver-xf86-dri-lite \
            mesa-dri \
            mesa-dri-driver-i965"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
-
-TARGET_CC_ARCH = "-m64"
-
 PREFERRED_VERSION_grub ?= "1.98"
-- 
1.7.0.4

[PATCH 3/6] meta-crownbay: use common .inc files

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Have crownbay.conf and crownbay-noemgd.conf use the common-bsp-* .inc
files and remove the open-coded machine settings.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-crownbay/conf/machine/crownbay-noemgd.conf |   19 ++-----------------
 meta-crownbay/conf/machine/crownbay.conf        |   19 ++-----------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index cc0b2eb..5abdd3d 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -8,29 +8,14 @@ TARGET_ARCH = "i586"
 
 include conf/machine/include/tune-atom.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
+include ../common/common-bsp-x.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
 XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
            xf86-video-vesa"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index c66b859..8469011 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -8,17 +8,11 @@ TARGET_ARCH = "i586"
 
 include conf/machine/include/tune-atom.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
+include ../common/common-bsp-x.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
 XSERVER ?= "xserver-xf86-dri-lite \
            emgd-driver-bin \
            xf86-input-mouse \
@@ -29,12 +23,3 @@ XSERVER ?= "xserver-xf86-dri-lite \
 
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.6"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-- 
1.7.0.4

[PATCH 4/6] meta-fishriver: use common .inc files

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Have fishriver.conf use the common-bsp-* .inc files and remove the
open-coded machine settings.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-fishriver/conf/machine/fishriver.conf |   20 +++-----------------
 1 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index e692cac..e2f49d0 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -8,29 +8,15 @@ TARGET_ARCH = "i586"
 
 include conf/machine/include/tune-atom.inc
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
+include ../common/common-bsp-x.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+
 XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
            xf86-video-vesa"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-- 
1.7.0.4

[PATCH 5/6] meta-jasperforest: use common .inc files

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Have jasperforest.conf use the common-bsp-* .inc files and remove the
open-coded machine settings.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-jasperforest/conf/machine/jasperforest.conf |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index 3f8591a..b603d16 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -9,18 +9,14 @@ PACKAGE_EXTRA_ARCHS = "x86 xeon"
 
 BASE_PACKAGE_ARCH="xeon"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
+TARGET_CC_ARCH = "-m64"
 
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
+include ../common/common-bsp-x.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
 XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-mouse \
            xf86-input-keyboard \
@@ -28,17 +24,5 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-vesa"
 
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub"
 PREFERRED_VERSION_grub ?= "1.98"
-
-TARGET_CC_ARCH = "-m64"
-
-- 
1.7.0.4

[PATCH 6/6] meta-emenlow: use common .inc files

[tom.zanussi]

From: Tom Zanussi <tom.zanussi@intel.com>

Have emenlow.conf use the common-bsp-* .inc files and remove the
open-coded machine settings.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-emenlow/conf/machine/emenlow.conf |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index b0b7d5e..209f029 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -8,15 +8,11 @@ TARGET_ARCH = "i586"
 
 include conf/machine/include/tune-atom.inc
 
-BASE_PACKAGE_ARCH="core2"
-
-MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
-                    acpi serial usbgadget"
-
-KERNEL_IMAGETYPE = "bzImage"
+include ../common/common-bsp-mach.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 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"
@@ -29,12 +25,3 @@ XSERVER ?= "xserver-psb \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
-
-IMAGE_FSTYPES ?= "ext3 cpio.gz"
-
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-- 
1.7.0.4

Re: [PATCH 1/6] meta-intel: add a couple common .inc files

[Richard Purdie]

Hi Tom,

On Thu, 2011-07-14 at 19:55 -0500, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> The meta-intel BSPs currently have a number of machine settings common
> to all - factor these out into a couple common include files.

For reference common include files are usually placed in
conf/machine/include/. If that happens they also need non-generic
suitably namespaced names, likely including "x86" or "ia32" in this
case.

The benefit is you can then refer to one of these includes from another
layer.

It also means you can refer to them as:

include conf/machine/includes/xxx

in other conf files removing some of the potential path issues.

I do like the cleanup this gives though, this is just a detail! :)

Cheers,

Richard

Re: [PATCH 1/6] meta-intel: add a couple common .inc files

[Tom Zanussi]

On Fri, 2011-07-15 at 06:23 -0700, Richard Purdie wrote:
> Hi Tom,
> 
> On Thu, 2011-07-14 at 19:55 -0500, tom.zanussi@intel.com wrote:
> > From: Tom Zanussi <tom.zanussi@intel.com>
> > 
> > The meta-intel BSPs currently have a number of machine settings common
> > to all - factor these out into a couple common include files.
> 
> For reference common include files are usually placed in
> conf/machine/include/. If that happens they also need non-generic
> suitably namespaced names, likely including "x86" or "ia32" in this
> case.
> 
> The benefit is you can then refer to one of these includes from another
> layer.
> 
> It also means you can refer to them as:
> 
> include conf/machine/includes/xxx
> 
> in other conf files removing some of the potential path issues.
> 
> I do like the cleanup this gives though, this is just a detail! :)
> 

Yeah, I wasn't sure all that would be welcome in there. ;-)

I'll respin it that way and resubmit...

Thanks for the input,

Tom

> Cheers,
> 
> Richard
> 

Re: [PATCH 1/6] meta-intel: add a couple common .inc files

[Darren Hart]

On 07/14/2011 05:55 PM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> The meta-intel BSPs currently have a number of machine settings common
> to all - factor these out into a couple common include files.
> 
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> ---
>  common/common-bsp-mach.inc |   13 +++++++++++++
>  common/common-bsp-x.inc    |    4 ++++
>  2 files changed, 17 insertions(+), 0 deletions(-)
>  create mode 100644 common/common-bsp-mach.inc
>  create mode 100644 common/common-bsp-x.inc
> 
> diff --git a/common/common-bsp-mach.inc b/common/common-bsp-mach.inc
> new file mode 100644
> index 0000000..b020a84
> --- /dev/null
> +++ b/common/common-bsp-mach.inc
> @@ -0,0 +1,13 @@
> +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
> +                    acpi serial usbgadget"
> +
> +KERNEL_IMAGETYPE = "bzImage"
> +
> +SERIAL_CONSOLE = "115200 ttyS0"
> +
> +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
> +

If these are going in common .inc files we need them to be easily
overridden, shouldn't all the above be using the ?= operator?

--
Darren

> +IMAGE_FSTYPES ?= "ext3 cpio.gz"
> +
> +GLIBC_ADDONS = "nptl"
> +GLIBC_EXTRA_OECONF = "--with-tls"
> diff --git a/common/common-bsp-x.inc b/common/common-bsp-x.inc
> new file mode 100644
> index 0000000..c012efd
> --- /dev/null
> +++ b/common/common-bsp-x.inc
> @@ -0,0 +1,4 @@
> +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
> +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
> +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
> +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel