genericx86 fixes

PATCH In review Ross Burton 3 participants 14 messages Aug 22, 2013 – Aug 24, 2013

lore

Share & tools

lore

Ross Burton

author

2013-08-22 15:59 UTC #0 lore raw

cover genericx86 fixes

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(-)

Signature · 1 line

1.7.10.4

Ross Burton

author

2013-08-22 15:59 UTC #1 lore raw

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

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

Signed-off-by Ross Burton <[email protected]>

---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
 1 file changed, 2 deletions(-)

meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend +0 -2

index c3d1290..160bcbb 100644
@@ -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"

Signature · 1 line

1.7.10.4

Ross Burton

author

2013-08-22 15:59 UTC #2 lore raw

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

The uvesafb framebuffer driver needs a userspace helper.

Signed-off-by Ross Burton <[email protected]>

---
 meta-yocto-bsp/conf/machine/genericx86.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta-yocto-bsp/conf/machine/genericx86.conf +1 -1

index 88464fa..e144754 100644
@@ -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"

Signature · 1 line

1.7.10.4

Ross Burton

author

2013-08-22 15:59 UTC #6 lore raw

PATCH 3/4 genericx86: disable USB autosuspend

In reply to Ross Burton

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

Signed-off-by Ross Burton <[email protected]>

---
 meta-yocto-bsp/conf/machine/genericx86.conf |    2 --
 1 file changed, 2 deletions(-)

meta-yocto-bsp/conf/machine/genericx86.conf +0 -2

index e144754..042f206 100644
@@ -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"

Signature · 1 line

1.7.10.4

Ross Burton

author

2013-08-22 15:59 UTC #8 lore raw

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

In reply to Ross Burton

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

Signed-off-by Ross Burton <[email protected]>

---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend +3 -1

index c4c005d..51c3736 100644
@@ -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"

Signature · 1 line

1.7.10.4

Darren Hart

Acked-by on v1 1/4

2013-08-22 17:37 UTC #11 lore raw

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

In reply to Ross Burton

Quoted 3 lines · Ross Burton

3.4 doesn't actually support genericx86, so remove any mention of it.
Signed-off-by Ross Burton <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 22 lines

---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
 1 file changed, 2 deletions(-)

meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend +0 -2

index c3d1290..160bcbb 100644
@@ -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"

Signature · 3 lines

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

Darren Hart

2013-08-22 17:44 UTC #3 lore raw

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

In reply to Ross Burton

Quoted 12 lines · Ross Burton

The uvesafb framebuffer driver needs a userspace helper.
Signed-off-by Ross Burton <[email protected]>
---
 meta-yocto-bsp/conf/machine/genericx86.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-yocto-bsp/conf/machine/genericx86.conf +0 -0
index 88464fa..e144754 100644

meta-yocto-bsp/conf/machine/genericx86.conf XSERVER ?= "xserver-xorg \ · line 30

Quoted 5 lines

meta-yocto-bsp/conf/machine/genericx86.conf +1 -1

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

meta-yocto-bsp/conf/machine/genericx86.conf XSERVER ?= "xserver-xorg \ · line 33

Quoted 3 lines

meta-yocto-bsp/conf/machine/genericx86.conf +0 -0
 IMAGE_FSTYPES ?= "ext3 cpio.gz live"
 

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

Signature · 3 lines

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

Darren Hart

Acked-by on v1 3/4

2013-08-22 17:45 UTC #7 lore raw

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

In reply to Ross Burton

Quoted 4 lines · Ross Burton

USB autosuspend doesn't reliably work with arbitrary hardware, so don't enable it.
Signed-off-by Ross Burton <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 17 lines

---
 meta-yocto-bsp/conf/machine/genericx86.conf |    2 --
 1 file changed, 2 deletions(-)

meta-yocto-bsp/conf/machine/genericx86.conf +0 -2

index e144754..042f206 100644
@@ -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"

Signature · 3 lines

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

Darren Hart

Acked-by on v1 4/4

2013-08-22 17:46 UTC #9 lore raw

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

In reply to Ross Burton

Quoted 3 lines · Ross Burton

The common-pc machine is now more featureful, so switch from atom-pc to common-pc.
Signed-off-by Ross Burton <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 21 lines

---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend +3 -1

index c4c005d..51c3736 100644
@@ -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"

Signature · 3 lines

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

Burton, Ross

author

2013-08-22 18:21 UTC #4 lore raw

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

In reply to Darren Hart

Quoted 4 lines · Darren Hart

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

Darren Hart

Acked-by

2013-08-22 18:33 UTC #5 lore raw

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

Quoted 10 lines · Ross

Quoted 4 lines · Darren Hart
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 <[email protected]>

Signature · 3 lines

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

Darren Hart

2013-08-24 03:39 UTC #12 lore raw

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

In reply to Ross Burton

Hi RP,

This one is still pending merge.

Quoted 25 lines · Ross Burton

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

Signed-off-by Ross Burton <[email protected]>

---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend |    2 --
 1 file changed, 2 deletions(-)

meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend +0 -2

index c3d1290..160bcbb 100644
@@ -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"

Signature · 3 lines

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

Darren Hart

2013-08-24 03:40 UTC #10 lore raw

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

In reply to Ross Burton

Hi RP,

This one is still pending merge as well.

Quoted 24 lines · Ross Burton

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

Signed-off-by Ross Burton <[email protected]>

---
 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend +3 -1

index c4c005d..51c3736 100644
@@ -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"

Signature · 3 lines

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

Richard Purdie

2013-08-24 08:38 UTC #13 lore raw

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

In reply to Darren Hart

Quoted 3 lines · Darren Hart

Hi RP,
This one is still pending merge.

Thanks, those two are in.

Cheers,

Richard