Update genericx86 and remove atom-pc
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.
PATCH 1/3 meta-yocto-bsp/genericx86: Update kernel, branch, KMACHINE, and SRCREV
For 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
Signed-off-by Darren Hart <[email protected]>
Cc Ross Burton <[email protected]>
--- 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 2/3 meta-yocto-bsp: Purge atom-pc in favor of genericx86
In reply to Darren Hartgenericx86 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.
Signed-off-by Darren Hart <[email protected]>
Cc Ross Burton <[email protected]>
--- 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
Re: [PATCH 2/3] meta-yocto-bsp: Purge atom-pc in favor of genericx86
Quoted 19 lines · Darren Hart
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.
Signed-off-by Darren Hart <[email protected]>Cc Ross Burton <[email protected]>--- 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(-)
Quoted 2 lines
delete mode 100644
meta-yocto-bsp/conf/machine/atom-pc.conf
What about local.conf? I assume you are working with Scott R, to replace this info in the Docs and on the quickstart and ...
Sau!
Quoted 136 lines
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 16mbmeta-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
Re: [PATCH 2/3] meta-yocto-bsp: Purge atom-pc in favor of genericx86
Quoted 23 lines · Saul Wold
Quoted 19 lines · Darren Hart
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.
Signed-off-by Darren Hart <[email protected]>Cc Ross Burton <[email protected]>--- 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(-)Quoted 2 lines
delete mode 100644
meta-yocto-bsp/conf/machine/atom-pc.conf
Quoted 2 lines
What about local.conf? I assume you are working with Scott R, to replace this info in the Docs and on the quickstart and ...
Ah thanks, I'll have a look. (I wasn't planning on doing this removal until about 45 minutes ago when it became my task ;-).
Will follow-up with that.
Quoted 139 lines
Sau!
Quoted 136 lines
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 16mbmeta-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 · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel
PATCH 3/3 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
Signed-off-by Elizabeth Flanagan <[email protected]>
Cc Ross Burton <[email protected]>
Signed-off-by Darren Hart <[email protected]>
--- 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