summaryrefslogtreecommitdiffstats
path: root/scripts/lib/bsp/substrate/target/arch/qemu
Commit message (Collapse)AuthorAgeFilesLines
* yocto-bsp: prepend includes in machine.scc files with machineTom Zanussi2013-02-071-2/+2
| | | | | | | | | | The names of the -user files were changed to have the machine prepended, but the includes weren't - fix the includes. (From meta-yocto rev: f56d24c04f00cfb2671e3f097f221d636ebb7943) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: qualify user files with machine nameBrian A. Lloyd2013-02-057-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bblayer abstraction makes it where multiple layers can be configured and used at the same time. Some layers make changes to support a specific machine, and should not have any affect when other machines are in use. For linux-yocto, all bsps are created with a user-config.cfg and user-config.cfg and user-patches.scc. This means that those files will be pulled from the first location found, which might correspond to files customized for a different machine. Instead of using the names user-config.cfg and user-patches.scc, I propose a machine specific name be used such as {{=machine}}user-patches.scc and {{=machine}}user-config.cfg. This would necessitate that all references changed to these new names, which would affect the yocto-bsp and yocto-kernel scripts. With this change, it would be possible to have multiple machine BSPs searched at the same time and to select which to build against by using a command like MACHINE=qmeux86 bitbake core-image-sato to override the default. Note many of the standard BSPs do not seem to suffer this problem as they do not use the common files user-config.cfg and user-patches.scc that the yocto-* scripts depend upon. Additions by Tom Zanussi: - renamed user-config.cfg to {{=machine}}-user-config.cfg everywhere - renamed user-patches.scc to {{=machine}}-user-patches.scc everywhere - added the user-config/patches SRC_URI items to the qemu -rt kernel recipes Fixes [YOCTO #3731] (From meta-yocto rev: b148d800773f3c2e6edeb4f05850b0291a8bb7d5) Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove 'test' options from user-config.cfgTom Zanussi2012-10-011-4/+0
| | | | | | | | | | A couple bsp templates have some options that were used for testing but aren't needed for any other reason - remove them. (From meta-yocto rev: dd3bbd04919f7cc69141f405ac95d736abddd637) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use FILESEXTRAPATHS for xserver-xf86-config bbappendsTom Zanussi2012-10-011-2/+1
| | | | | | | | | | The xserver-xf86-config .bbappends are still using FILESPATH - update them to use FILESEXTRAPATHS as recommended by the Poky Reference Manual and BSP Developer's Guides. (From meta-yocto rev: 6aaef8eb9e95a46ab02ef038ae53c8e63eb04e09) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' casesTom Zanussi2012-08-294-4/+8
| | | | | | | | | | | | | | | The new yocto-kernel way of specifying that the branch sanity check doesn't need to be run is to specify a default kbranch and build that. In the case where we have a new kbranch but it's not yet in the repo, we need to tell it that our new branch is the default and we're building the default and that's how we avoid the sanity check and the subsequent do_validate_branches() failure. (From meta-yocto rev: dadd020c67e901609be3ac13a4ffd8cb28532966) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove obsolete referencesTom Zanussi2012-08-291-2/+0
| | | | | | | | | | | | The logbuf-normal feature is obsolete, so remove any references to it. The dmaengine and hpet features have changed, but don't really need to be added by default to i386 - leave that to the BSP developer. Also, remove a couple duplicate feature references in the .scc files. (From meta-yocto rev: 3f37864d474912d680c2e6ee2a962e9fa61df39b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add missing xserver-xf86-config .bbappend for qemuTom Zanussi2012-08-251-0/+2
| | | | | | | | | | Re-add xserver-xf86-config which was inadvertently removed. (From meta-yocto rev: 08c0c5c53ba625f28eb243968c9c3844ba99d780) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use base branches for qemu 'newbranch' caseTom Zanussi2012-08-254-8/+8
| | | | | | | | | | | The branch updating for the [YOCTO #2587] fix inadvertently changed some of the qemu branch names incorrectly, fix it. (From meta-yocto rev: dde4cd9f88093b8c520a6a42f9dda917f4aff5e4) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove YOCTO_KERNEL_EXTERNAL_BRANCH usageTom Zanussi2012-08-254-12/+0
| | | | | | | | | | | YOCTO_KERNEL_EXTERNAL_BRANCH is now obsolete, so remove it from the templates. (From meta-yocto rev: 0c440984f3f429d5282559208313dfe7492b8b90) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add 3.4/remove 3.0 kernel from templatesTom Zanussi2012-08-253-26/+26
| | | | | | | | | | For 1.3, 3.4 is the preferred kernel and 3.0 isn't supported. (From meta-yocto rev: ef7f8257ec9830e3eab0acec20564105d23a74f7) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove 'branch' statements in .scc if reusing branchTom Zanussi2012-08-252-8/+2
| | | | | | | | | | | If reusing a branch (need_new_branch == 'n') we don't need to branch in the .scc, so make it conditional on need_new_branch. (From meta-yocto rev: 1e698ad2d18249c6224821bd52e3b979750db256) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use standard branch mapping in bsp templatesTom Zanussi2012-08-251-2/+2
| | | | | | | | (From meta-yocto rev: 716fdb4b1bd7cb91b07753b6747767ae55eeb1d2) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use branches_baseTom Zanussi2012-08-254-40/+40
| | | | | | | | (From meta-yocto rev: 027c010b6864741cbbefdc710e36963767d7a431) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update default branch namesTom Zanussi2012-08-254-20/+20
| | | | | | | | | | | | | Make sure the default branch names match branch names found in the kernel branch listing. Fixes [YOCTO #2587]. (From meta-yocto rev: a46fc3dad25eac4a28265c956913f46ef25c0cee) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: strip '/base' from kernel branches in templatesTom Zanussi2012-08-254-8/+8
| | | | | | | | | | | | | For new branches, users can specify /base branches, but we don't want the '/base' in the resultant branch name, so remove it. Fixes [YOCTO #2693]. (From meta-yocto rev: 40e925862884fd981dec63fc598326c73e4a4c20) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core: Prefer mesa-dri as virtual/libopengles1/2 providerDamien Lespiau2012-08-191-0/+2
| | | | | | | | | | | Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's prefer the accelerated version. (From meta-yocto rev: 13f847744aa842ef38b3f2adf3764425319b5507) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update yocto-bsp xorg.conf templatesTom Zanussi2012-06-262-2/+8
| | | | | | | | | | | | The non-x86 qemu machines now require an xorg.conf, change the templates accordingly. Fixes [YOCTO #2559] (From meta-yocto rev: d465c09d8df0e6d210ba8cd3c17549a07a8e134d) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update yocto-bsp machine.conf templateTom Zanussi2012-06-261-2/+5
| | | | | | | | | | | | Some changes in the ordering assumptions of the qemu include rendered X inoperative, fix those in the qemu machine template. Fixes [YOCTO #2559] (From meta-yocto rev: c3d208267dea6bc0f8be2eb9c63b4125730bb21b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: fix x86_64 tuning for qemu archTom Zanussi2012-04-141-1/+1
| | | | | | | | While testing the fix for [YOCTO #2222] I noticed that the tuning for the qemu x86_64 target was using the wrong tuning file - it should be x86_64 instead of i586. Change the template to match. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
* yocto-bsp: fix multi-provider error in qemu arch templateTom Zanussi2012-04-141-0/+1
| | | | | | | | | | | | While testing the fix for [YOCTO #2222] I noticed a new build error that wasn't there in previous testing: ERROR: Multiple .bb files are due to be built which each provide virtual/libgl The build still completed and produced a good image, but an error message was displayed, which this patch removes. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
* yocto-bsp: fix qemuarch test for xserver-xf86-config.bbappendTom Zanussi2012-04-141-0/+0
| | | | | | | | While testing the fix for [YOCTO #2222] I noticed that the qemuarch test was wrong - there is no 'x86' qemuarch, just 'i386'. Change the test to match. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
* yocto-bsp: add BSP template filesTom Zanussi2012-03-2214-0/+452
BSP template files for all supported Yocto architectures, plus qemu versions of the same. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>