Update genericx86 and remove atom-pc
PATCH v2 1/6 meta-yocto-bsp/genericx86: Update kernel, branch, KMACHINE, and SRCREV
In reply to Darren HartFor the genericx86 machine:
o Update the PREFERRED_VERSION for linux-yocto to 3.10
o Change the KBRANCH to common-pc/base
o Change the SRCREV to the HEAD
o Change the KMACHINE to a valid linux-yocto BSP name
--- meta-yocto-bsp/conf/machine/genericx86.conf | 2 +- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
meta-yocto-bsp/conf/machine/genericx86.conf +1 -1
@@ -10,7 +10,7 @@ MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" KERNEL_IMAGETYPE = "bzImage" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" +PREFERRED_VERSION_linux-yocto ?= "3.10%" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-glx \
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend +4 -2
@@ -1,11 +1,13 @@ 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" +KMACHINE_genericx86 ?= "common-pc" + SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" -SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" +SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a" SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
Signature · 1 line
1.7.9.5
PATCH v2 2/6 meta-yocto-bsp: Purge atom-pc in favor of genericx86
genericx86 is a superset of atom-pc, so remove all references to atom-pc.
Note that genericx86 only has 3.10 linux-yocto support, that leaves us with no x86 BSP in meta-yocto-bsp for the 3.4 kernel. As a general rule, new BSPs are targeted at the current kernel version, so this is normal, but something worth noting.
--- meta-yocto-bsp/conf/machine/atom-pc.conf | 37 -------------------- .../packagegroup-core-tools-profile.bbappend | 1 - .../packagegroup-core-sdk-gmae.bbappend | 1 - ...egroup-core-standalone-gmae-sdk-target.bbappend | 1 - .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 3 -- .../recipes-kernel/linux/linux-yocto_3.4.bbappend | 3 -- .../recipes-kernel/linux/linux-yocto_3.8.bbappend | 3 -- 7 files changed, 49 deletions(-) delete mode 100644 meta-yocto-bsp/conf/machine/atom-pc.conf
meta-yocto-bsp/conf/machine/atom-pc.conf deleted +0 -37
@@ -1,37 +0,0 @@ -#@TYPE: Machine -#@NAME: Atom-PC - -#@DESCRIPTION: Machine configuration for Intel Atom based PCs. Currently supported machines are the Asus eee901, Acer Aspire One, Toshiba NB305, and Intel BlackSand development board. - -include conf/machine/include/tune-atom.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" - -KERNEL_IMAGETYPE = "bzImage" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.8%" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xserver-xorg-extension-glx \ - xf86-input-mouse \ - xf86-input-keyboard \ - xf86-input-evdev \ - xf86-input-synaptics \ - xf86-video-intel \ - mesa-driver-i915 \ - mesa-driver-i965" - -#MACHINE_EXTRA_RDEPENDS = "rt2860" - -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" - -IMAGE_FSTYPES ?= "ext3 cpio.gz live" - -APPEND += "usbcore.autosuspend=1" - -GLIBC_ADDONS = "nptl" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" - -ROOTLESS_X = "1"
meta-yocto-bsp/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend +0 -1
@@ -1,3 +1,2 @@ -RDEPENDS_${PN}_append_atom-pc = " lttng-ust systemtap" RDEPENDS_${PN}_append_genericx86 = " lttng-ust systemtap"
meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bbappend +0 -1
@@ -1,2 +1 @@ -SDK-EXTRAS_atom-pc ?= " lttng-ust-dev" SDK-EXTRAS_genericx86 ?= " lttng-ust-dev"
meta-yocto-bsp/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bbappend +0 -1
@@ -1,2 +1 @@ -SDK-EXTRAS_atom-pc ?= " lttng-ust-dev" SDK-EXTRAS_genericx86 ?= " lttng-ust-dev"
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend +0 -3
@@ -1,4 +1,3 @@ -KBRANCH_atom-pc = "standard/common-pc/atom-pc" KBRANCH_genericx86 = "standard/common-pc/base" KBRANCH_routerstationpro = "standard/routerstationpro" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
@@ -6,7 +5,6 @@ KBRANCH_beagleboard = "standard/beagleboard" KMACHINE_genericx86 ?= "common-pc" -SRCREV_machine_atom-pc ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79" SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a"
@@ -15,7 +13,6 @@ SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" 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
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.4.bbappend +0 -3
@@ -1,9 +1,7 @@ -KBRANCH_atom-pc = "standard/common-pc/atom-pc" KBRANCH_routerstationpro = "standard/routerstationpro" KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" KBRANCH_beagleboard = "standard/beagleboard" -SRCREV_machine_atom-pc ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" SRCREV_machine_genericx86 ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" SRCREV_machine_routerstationpro ?= "62b86dc8ac794cd97c61a99418d7429e6a83ec1a" SRCREV_machine_mpc8315e-rdb ?= "b2f78892b3ff6cc940e4661f7b2017a73b289c73"
@@ -12,7 +10,6 @@ SRCREV_machine_beagleboard ?= "cdd7a546922ca1c46c94adeec3b9c90dc9aaad2d" COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb" COMPATIBLE_MACHINE_routerstationpro = "routerstationpro" COMPATIBLE_MACHINE_beagleboard = "beagleboard" -COMPATIBLE_MACHINE_atom-pc = "atom-pc" # routerstationpro has a flash size of 16mb KERNEL_IMAGE_MAXSIZE_append_routerstationpro = "16777216"
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend +0 -3
@@ -1,10 +1,8 @@ -KBRANCH_atom-pc = "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" -SRCREV_machine_atom-pc ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" SRCREV_machine_genericx86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" SRCREV_machine_routerstationpro ?= "4a94f39d429fa284ce69b13bb635b29b1319e372" SRCREV_machine_mpc8315e-rdb ?= "f467c72937de0e4a2a66e21b9855c4aee844f936"
@@ -13,7 +11,6 @@ SRCREV_machine_beagleboard ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 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
Signature · 1 line
1.7.9.5
PATCH v2 3/6 layer.conf: Bumping LAYERVERSION_yoctobsp to account for atom-pc
In reply to Darren HartFrom: Elizabeth Flanagan <[email protected]>
In order to maintain autobuilder compatibility with prior releases we'll need to decide on if we should build atom-pc or genericx86 based on LAYERVERSION_yoctobsp.
if LAYERVERSION_yoctobsp < 2 we build out atom-pc else we build out genericx86
--- meta-yocto-bsp/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-yocto-bsp/conf/layer.conf +1 -1
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yoctobsp" BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" - +LAYERVERSION_yoctobsp = "2"
Signature · 1 line
1.7.9.5
PATCH v2 4/6 local.conf.sample: Replace atom-pc with genericx86
In reply to Darren HartUpdate the sample local.conf file to reflect the recent replacement of atom-pc with genericx86.
--- meta-yocto/conf/local.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-yocto/conf/local.conf.sample +1 -1
@@ -42,7 +42,7 @@ # There are also the following hardware board target machines included for # demonstration purposes: # -#MACHINE ?= "atom-pc" +#MACHINE ?= "genericx86" #MACHINE ?= "beagleboard" #MACHINE ?= "genericx86" #MACHINE ?= "mpc8315e-rdb"
Signature · 1 line
1.7.9.5
PATCH v2 5/6 README.hardware: Replace atom-pc with genericx86
In reply to Darren HartUpdate README.hardware to reflect the recent replacement of atom-pc with genericx86.
--- README.hardware | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
README.hardware +6 -6
@@ -59,7 +59,7 @@ Consumer Devices The following consumer devices are supported by the meta-yocto-bsp layer: - * Intel Atom based PCs and devices (atom-pc) + * Intel x86 based PCs and devices (genericx86) For more information see the device's section below. The appropriate MACHINE variable value corresponding to the device is given in brackets.
@@ -70,10 +70,10 @@ variable value corresponding to the device is given in brackets. =============================== -Intel Atom based PCs and devices (atom-pc) +Intel x86 based PCs and devices (genericx86) ========================================== -The atom-pc MACHINE is tested on the following platforms: +The genericx86 MACHINE is tested on the following platforms: o Asus EeePC 901 o Acer Aspire One
@@ -93,7 +93,7 @@ device as the following commands are run as root and are not reversable. USB Device: 1. Build a live image. This image type consists of a simple filesystem without a partition table, which is suitable for USB keys, and with the - default setup for the atom-pc machine, this image type is built + default setup for the genericx86 machine, this image type is built automatically for any image you build. For example: $ bitbake core-image-minimal
@@ -101,7 +101,7 @@ USB Device: 2. Use the "dd" utility to write the image to the raw block device. For example: - # dd if=core-image-minimal-atom-pc.hddimg of=/dev/sdb + # dd if=core-image-minimal-genericx86.hddimg of=/dev/sdb If the device fails to boot with "Boot error" displayed, or apparently stops just after the SYSLINUX version banner, it is likely the BIOS cannot
@@ -142,7 +142,7 @@ USB Device: # mkdir /tmp/image # mkdir /tmp/usbkey - # mount -o loop core-image-minimal-atom-pc.hddimg /tmp/image + # mount -o loop core-image-minimal-genericx86.hddimg /tmp/image # mount /dev/sdb4 /tmp/usbkey # cp -rf /tmp/image/* /tmp/usbkey
Signature · 1 line
1.7.9.5
PATCH v2 6/6 documentation: Replace atom-pc with genericx86 in the manuals
In reply to Darren HartUpdate the manuals to reflect the recent replacement of atom-pc with genericx86.
--- documentation/dev-manual/dev-manual-model.xml | 2 +- documentation/ref-manual/ref-variables.xml | 2 +- documentation/ref-manual/technical-details.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
documentation/dev-manual/dev-manual-model.xml +1 -1
@@ -156,7 +156,7 @@ "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>" section in the Yocto Project Board Support Package (BSP) Developer's Guide.</para> <note>Four BSPs exist that are part of the - Yocto Project release: <filename>atom-pc</filename>, <filename>beagleboard</filename>, + Yocto Project release: <filename>genericx86</filename>, <filename>beagleboard</filename>, <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>. The recipes and configurations for these four BSPs are located and dispersed within the <link linkend='source-directory'>Source Directory</link>.
documentation/ref-manual/ref-variables.xml +1 -1
@@ -2784,7 +2784,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" MACHINE ?= "qemuppc" MACHINE ?= "qemux86" MACHINE ?= "qemux86-64" - MACHINE ?= "atom-pc" + MACHINE ?= "genericx86" MACHINE ?= "beagleboard" MACHINE ?= "mpc8315e-rdb" MACHINE ?= "routerstationpro"
documentation/ref-manual/technical-details.xml +1 -1
@@ -1875,7 +1875,7 @@ DEFAULTTUNE = "x86-64-x32" baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) \ or 'INVALID'), True) or 'lib'}" - #MACHINE = "atom-pc" + #MACHINE = "genericx86" #DEFAULTTUNE = "core2-64-x32" </literallayout></para></listitem> <listitem><para>As usual, use BitBake to build an image that supports the x32 psABI.
Signature · 1 line
1.7.9.5
v2 cover Update genericx86 and remove atom-pc
This series updates the genericx86 BSP to use the linux-yocto 3.10 recipe and fixes some of the meta-data related to that.
It also removes the atom-pc machine in favor of genericx86 which is a super set of atom-pc. This leaves us with no x86 linux-yocto 3.4 based BSP, but that is standard operating procedure when introducing new BSPs.
Boot tested on the Toshiba NB305 (Pineview) netbook. Ethernet and wifi are not currently supported and will need to be added in a SRCREV update after the linux-yocto meta-data for genericx86 has been augmented. The mode switching and Xorg graphics drivers work correctly, as do USB HID devices.
V2: Include documentation and config file changes
The following changes since commit 5c2d5f69e88eb1b5eac0ff71a0394a612af4b5d4:
meta-yocto: change default kernel to 3.10 (2013-08-26 11:22:34 -0700)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib dvhart/genericx86
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/genericx86
Darren Hart (5):
meta-yocto-bsp/genericx86: Update kernel, branch, KMACHINE, and SRCREV
meta-yocto-bsp: Purge atom-pc in favor of genericx86 local.conf.sample: Replace atom-pc with genericx86 README.hardware: Replace atom-pc with genericx86
documentation: Replace atom-pc with genericx86 in the manuals
Elizabeth Flanagan (1):
layer.conf: Bumping LAYERVERSION_yoctobsp to account for atom-pc
README.hardware | 12 +++---- documentation/dev-manual/dev-manual-model.xml | 2 +- documentation/ref-manual/ref-variables.xml | 2 +- documentation/ref-manual/technical-details.xml | 2 +- meta-yocto-bsp/conf/layer.conf | 2 +- meta-yocto-bsp/conf/machine/atom-pc.conf | 37 -------------------- meta-yocto-bsp/conf/machine/genericx86.conf | 2 +- .../packagegroup-core-tools-profile.bbappend | 1 - .../packagegroup-core-sdk-gmae.bbappend | 1 - ...egroup-core-standalone-gmae-sdk-target.bbappend | 1 - .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 9 +++-- .../recipes-kernel/linux/linux-yocto_3.4.bbappend | 3 -- .../recipes-kernel/linux/linux-yocto_3.8.bbappend | 3 -- meta-yocto/conf/local.conf.sample | 2 +- 14 files changed, 16 insertions(+), 63 deletions(-) delete mode 100644 meta-yocto-bsp/conf/machine/atom-pc.conf
Signature · 1 line
1.7.9.5
Re: [PATCH 6/6] documentation: Replace atom-pc with genericx86 in the manuals
In reply to Darren HartHi Darren,
Quoted 54 lines · On Monday 26 August 2013 15:18:12 Darren Hart wrote:
Update the manuals to reflect the recent replacement of atom-pc with genericx86.
Signed-off-by Darren Hart <[email protected]>Cc Ross Burton <[email protected]>Cc Scott Rifenbark <[email protected]>--- documentation/dev-manual/dev-manual-model.xml | 2 +- documentation/ref-manual/ref-variables.xml | 2 +- documentation/ref-manual/technical-details.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)(quoted diff) +0
-0
b/documentation/dev-manual/dev-manual-model.xmlindex a59a447..efa50b0 100644documentation/dev-manual/dev-manual-model.xml +0
-0@@ -156,7 +156,7 @@ "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>" section in the Yocto Project Board Support Package (BSP)Developer's Guide.</para> <note>Four BSPs exist that are part of the
- Yocto Project release: <filename>atom-pc</filename>,
<filename>beagleboard</filename>, + Yocto Project
release: <filename>genericx86</filename>, <filename>beagleboard</filename>, <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>. The recipes and configurations for these four BSPs are located and dispersed within the <link linkend='source-directory'>Source Directory</link>. diff --gita/documentation/ref-manual/ref-variables.xmlb/documentation/ref-manual/ref-variables.xmlindex afcf7a7..4ac67c3 100644documentation/ref-manual/ref-variables.xml +0
-0@@ -2784,7 +2784,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR ="${INC_PR}.3" MACHINE ?= "qemuppc"
MACHINE ?= "qemux86" MACHINE ?= "qemux86-64"documentation/ref-manual/ref-variables.xml +1
-1- MACHINE ?= "atom-pc" + MACHINE ?= "genericx86" MACHINE ?= "beagleboard" MACHINE ?= "mpc8315e-rdb" MACHINE ?= "routerstationpro"(quoted diff) +0
-0
b/documentation/ref-manual/technical-details.xmlindex 1b67ca7..faf259b 100644documentation/ref-manual/technical-details.xml +0
-0@@ -1875,7 +1875,7 @@ DEFAULTTUNE = "x86-64-x32" baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE',True) \ or 'INVALID'), True) or 'lib'}"
documentation/ref-manual/technical-details.xml +1
-1- #MACHINE = "atom-pc" + #MACHINE = "genericx86" #DEFAULTTUNE = "core2-64-x32" </literallayout></para></listitem> <listitem><para>As usual, use BitBake to build an image
Quoted 1 line
that supports the x32 psABI.
This patch needs to be made against yocto-docs and sent to the yocto list (CC Scott).
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [PATCH 6/6] documentation: Replace atom-pc with genericx86 in the manuals
Quoted 15 lines · Paul Eggleton
Hi Darren,
Quoted 12 lines · On Monday 26 August 2013 15:18:12 Darren Hart wrote:
Update the manuals to reflect the recent replacement of atom-pc with genericx86.
Signed-off-by Darren Hart <[email protected]>Cc Ross Burton <[email protected]>Cc Scott Rifenbark <[email protected]>--- documentation/dev-manual/dev-manual-model.xml | 2 +- documentation/ref-manual/ref-variables.xml | 2 +- documentation/ref-manual/technical-details.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
...
Quoted 2 lines
This patch needs to be made against yocto-docs and sent to the yocto list (CC Scott).
Done. Thanks Paul.
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel