[PATCH 0/4] genericx86 fixes

[PATCH 0/4] genericx86 fixes

[Ross Burton]

Hi,

The headline here is using the improved kernel configuration I've been playing
with, so this is all pending Bruce's kernel push.

Ross

The following changes since commit b2ff1add530b1fec2fb7f385227a03db47015c37:

  poky.conf: Don't force the addition of extra DISTRO_FEATURES (2013-08-20 22:58:04 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/genericx86-next

for you to fetch changes up to eba8d2a94e36103fabecdd0c68142e2ea1d21b10:

  linux-yocto: switch genericx86 to use common-pc (2013-08-22 16:52:47 +0100)

----------------------------------------------------------------
Ross Burton (4):
      linux-yocto: remove genericx86 support from 3.4
      genericx86: add v86d to machine recommends for uvesafb
      genericx86: disable USB autosuspend
      linux-yocto: switch genericx86 to use common-pc

 meta-yocto-bsp/conf/machine/genericx86.conf                  |    4 +---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

Ross Burton (4):
  linux-yocto: remove genericx86 support from 3.4
  genericx86: add v86d to machine recommends for uvesafb
  genericx86: disable USB autosuspend
  linux-yocto: switch genericx86 to use common-pc

 meta-yocto-bsp/conf/machine/genericx86.conf                  |    4 +---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
 3 files changed, 4 insertions(+), 6 deletions(-)

-- 
1.7.10.4

[PATCH 1/4] linux-yocto: remove genericx86 support from 3.4

[Ross Burton]

3.4 doesn't actually support genericx86, so remove any mention of it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
index c3d1290..160bcbb 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,5 +1,4 @@
 KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
-KBRANCH_genericx86  = "standard/common-pc/atom-pc"
 KBRANCH_routerstationpro = "standard/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
 KBRANCH_beagleboard = "standard/beagleboard"
@@ -14,7 +13,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
 COMPATIBLE_MACHINE_beagleboard = "beagleboard"
 COMPATIBLE_MACHINE_atom-pc = "atom-pc"
-COMPATIBLE_MACHINE_genericx86 = "genericx86"
 
 # routerstationpro has a flash size of 16mb
 KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216"
-- 
1.7.10.4

[PATCH 2/4] genericx86: add v86d to machine recommends for uvesafb

[Ross Burton]

The uvesafb framebuffer driver needs a userspace helper.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-yocto-bsp/conf/machine/genericx86.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index 88464fa..e144754 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -27,7 +27,7 @@ XSERVER ?= "xserver-xorg \
 
 #MACHINE_EXTRA_RDEPENDS = "rt2860"
 
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware"
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d"
 
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
-- 
1.7.10.4

[PATCH 3/4] genericx86: disable USB autosuspend

[Ross Burton]

USB autosuspend doesn't reliably work with arbitrary hardware, so don't enable
it.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-yocto-bsp/conf/machine/genericx86.conf |    2 --
 1 file changed, 2 deletions(-)

diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
index e144754..042f206 100644
--- a/meta-yocto-bsp/conf/machine/genericx86.conf
+++ b/meta-yocto-bsp/conf/machine/genericx86.conf
@@ -31,8 +31,6 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d
 
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 
-APPEND += "usbcore.autosuspend=1"
-
 GLIBC_ADDONS = "nptl"
 
 EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
-- 
1.7.10.4

[PATCH 4/4] linux-yocto: switch genericx86 to use common-pc

[Ross Burton]

The common-pc machine is now more featureful, so switch from atom-pc to common-pc.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
index c4c005d..51c3736 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -1,5 +1,5 @@
 KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
-KBRANCH_genericx86  = "standard/common-pc/atom-pc"
+KBRANCH_genericx86  = "standard/common-pc/base"
 KBRANCH_routerstationpro = "standard/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
 KBRANCH_beagleboard = "standard/beagleboard"
@@ -18,3 +18,5 @@ COMPATIBLE_MACHINE_genericx86 = "genericx86"
 
 # routerstationpro has a flash size of 16mb
 KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"
+
+KMACHINE_genericx86 = "common-pc"
-- 
1.7.10.4

Re: [PATCH 1/4] linux-yocto: remove genericx86 support from 3.4

[Darren Hart]

On Thu, 2013-08-22 at 16:59 +0100, Ross Burton wrote:
> 3.4 doesn't actually support genericx86, so remove any mention of it.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Acked-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
> index c3d1290..160bcbb 100644
> --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
> +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
> @@ -1,5 +1,4 @@
>  KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
> -KBRANCH_genericx86  = "standard/common-pc/atom-pc"
>  KBRANCH_routerstationpro = "standard/routerstationpro"
>  KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
>  KBRANCH_beagleboard = "standard/beagleboard"
> @@ -14,7 +13,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
>  COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
>  COMPATIBLE_MACHINE_beagleboard = "beagleboard"
>  COMPATIBLE_MACHINE_atom-pc = "atom-pc"
> -COMPATIBLE_MACHINE_genericx86 = "genericx86"
>  
>  # routerstationpro has a flash size of 16mb
>  KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216"

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

Re: [PATCH 2/4] genericx86: add v86d to machine recommends for uvesafb

[Darren Hart]

On Thu, 2013-08-22 at 16:59 +0100, Ross Burton wrote:
> The uvesafb framebuffer driver needs a userspace helper.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta-yocto-bsp/conf/machine/genericx86.conf |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
> index 88464fa..e144754 100644
> --- a/meta-yocto-bsp/conf/machine/genericx86.conf
> +++ b/meta-yocto-bsp/conf/machine/genericx86.conf
> @@ -27,7 +27,7 @@ XSERVER ?= "xserver-xorg \
>  
>  #MACHINE_EXTRA_RDEPENDS = "rt2860"
>  
> -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware"
> +MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d"

This is added to MACHINE_ESSENTIAL_EXTRA_RDEPENDS for qemux86. 

MACHINE_EXTRA_RRECOMMENDS does not impact packagegroup-core-boot, and
therefor not core-image-minimal. Perhaps that is the intention?

These 4 variables can be confusing, so I wanted to ask the question and
make sure we are getting the intended behavior here.

>  
>  IMAGE_FSTYPES ?= "ext3 cpio.gz live"
>  

live.... do we halfta? I know... for now... sigh....

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

Re: [PATCH 3/4] genericx86: disable USB autosuspend

[Darren Hart]

On Thu, 2013-08-22 at 16:59 +0100, Ross Burton wrote:
> USB autosuspend doesn't reliably work with arbitrary hardware, so don't enable
> it.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Acked-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  meta-yocto-bsp/conf/machine/genericx86.conf |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/meta-yocto-bsp/conf/machine/genericx86.conf b/meta-yocto-bsp/conf/machine/genericx86.conf
> index e144754..042f206 100644
> --- a/meta-yocto-bsp/conf/machine/genericx86.conf
> +++ b/meta-yocto-bsp/conf/machine/genericx86.conf
> @@ -31,8 +31,6 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d
>  
>  IMAGE_FSTYPES ?= "ext3 cpio.gz live"
>  
> -APPEND += "usbcore.autosuspend=1"
> -
>  GLIBC_ADDONS = "nptl"
>  
>  EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"

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

Re: [PATCH 4/4] linux-yocto: switch genericx86 to use common-pc

[Darren Hart]

On Thu, 2013-08-22 at 16:59 +0100, Ross Burton wrote:
> The common-pc machine is now more featureful, so switch from atom-pc to common-pc.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>

Acked-by: Darren Hart <dvhart@linux.intel.com>


> ---
>  meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
> index c4c005d..51c3736 100644
> --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
> +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
> @@ -1,5 +1,5 @@
>  KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
> -KBRANCH_genericx86  = "standard/common-pc/atom-pc"
> +KBRANCH_genericx86  = "standard/common-pc/base"
>  KBRANCH_routerstationpro = "standard/routerstationpro"
>  KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
>  KBRANCH_beagleboard = "standard/beagleboard"
> @@ -18,3 +18,5 @@ COMPATIBLE_MACHINE_genericx86 = "genericx86"
>  
>  # routerstationpro has a flash size of 16mb
>  KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"
> +
> +KMACHINE_genericx86 = "common-pc"

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

Re: [PATCH 2/4] genericx86: add v86d to machine recommends for uvesafb

[Burton, Ross]

On 22 August 2013 18:44, Darren Hart <dvhart@linux.intel.com> wrote:
> This is added to MACHINE_ESSENTIAL_EXTRA_RDEPENDS for qemux86.
>
> MACHINE_EXTRA_RRECOMMENDS does not impact packagegroup-core-boot, and
> therefor not core-image-minimal. Perhaps that is the intention?

It's not essential, no v86d means no uvesafb driver which isn't the
end of the world, and possibly what you want for a minimal image.

Ross

Re: [PATCH 2/4] genericx86: add v86d to machine recommends for uvesafb

[Darren Hart]

On Thu, 2013-08-22 at 19:21 +0100, Burton, Ross wrote:
> On 22 August 2013 18:44, Darren Hart <dvhart@linux.intel.com> wrote:
> > This is added to MACHINE_ESSENTIAL_EXTRA_RDEPENDS for qemux86.
> >
> > MACHINE_EXTRA_RRECOMMENDS does not impact packagegroup-core-boot, and
> > therefor not core-image-minimal. Perhaps that is the intention?
> 
> It's not essential, no v86d means no uvesafb driver which isn't the
> end of the world, and possibly what you want for a minimal image.
> 
> Ross

In that case:

Acked-by: Darren Hart <dvhart@linux.intel.com>

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

Re: [PATCH 1/4] linux-yocto: remove genericx86 support from 3.4

[Darren Hart]

Hi RP,

This one is still pending merge.

On Thu, 2013-08-22 at 16:59 +0100, Ross Burton wrote:
> 3.4 doesn't actually support genericx86, so remove any mention of it.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
> index c3d1290..160bcbb 100644
> --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
> +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend
> @@ -1,5 +1,4 @@
>  KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
> -KBRANCH_genericx86  = "standard/common-pc/atom-pc"
>  KBRANCH_routerstationpro = "standard/routerstationpro"
>  KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
>  KBRANCH_beagleboard = "standard/beagleboard"
> @@ -14,7 +13,6 @@ COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
>  COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
>  COMPATIBLE_MACHINE_beagleboard = "beagleboard"
>  COMPATIBLE_MACHINE_atom-pc = "atom-pc"
> -COMPATIBLE_MACHINE_genericx86 = "genericx86"
>  
>  # routerstationpro has a flash size of 16mb
>  KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216"

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

Re: [PATCH 4/4] linux-yocto: switch genericx86 to use common-pc

[Darren Hart]

Hi RP,

This one is still pending merge as well.

On Thu, 2013-08-22 at 16:59 +0100, Ross Burton wrote:
> The common-pc machine is now more featureful, so switch from atom-pc to common-pc.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
> index c4c005d..51c3736 100644
> --- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
> +++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
> @@ -1,5 +1,5 @@
>  KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
> -KBRANCH_genericx86  = "standard/common-pc/atom-pc"
> +KBRANCH_genericx86  = "standard/common-pc/base"
>  KBRANCH_routerstationpro = "standard/routerstationpro"
>  KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
>  KBRANCH_beagleboard = "standard/beagleboard"
> @@ -18,3 +18,5 @@ COMPATIBLE_MACHINE_genericx86 = "genericx86"
>  
>  # routerstationpro has a flash size of 16mb
>  KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"
> +
> +KMACHINE_genericx86 = "common-pc"

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

Re: [PATCH 1/4] linux-yocto: remove genericx86 support from 3.4

[Richard Purdie]

On Fri, 2013-08-23 at 20:39 -0700, Darren Hart wrote:
> Hi RP,
> 
> This one is still pending merge.

Thanks, those two are in.

Cheers,

Richard