summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86-64.conf
Commit message (Collapse)AuthorAgeFilesLines
* qemux86*: Add U-Boot machine configurationMarek Vasut2018-07-181-0/+2
| | | | | | | | | | | | | | | | Add U-Boot machine configuration for the qemux86 and qemux86-64 to allow building U-Boot on those targets. This in turn allows the auto-updater to update the U-Boot recipe. (From OE-Core rev: c9bd7f71b59e1c8e7436d65cd8ad6bfb29051c93) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86*: change default wic wks to qemux86-directdiskAnuj Mittal2018-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When runqemu is invoked with an image type (wic, hddimg etc) as a parameter, the kernel value and command line parameters from qemuboot.conf are ignored and not passed to qemu cmdline. As an example, when using: $ runqemu wic kvm It results in no network interface and video mode warnings when qemu is up because the -kernel and -append options were not passed. Change qemu conf to use qemux86-directdisk.wks that supplies the kernel parameters that are appended to the bootloader configuration when generating qemu wic images instead of relying on qemuboot.conf. Fixes [YOCTO #12224] (From OE-Core rev: 3b79d9a78816d2eb70fe54ca6cd086d94c115f05) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu conf: Fix kernel module autoloading for uvesafb on genericx86Alejandro Hernandez2017-09-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit e8b1c653946ef921b65d47e52aea0dc530ef4286, we started seeing errors like the following during boot on genericx86 machines: uvesafb: failed to execute /sbin/v86d uvesafb: probe of uvesafb.0 failed with error -22 uvesafb: vbe_init() failed with -22 uvesafb: Getting VBE info block failed (eax=0x4f00, err=-2) These were caused because the uvesa module was being loaded during boot, when it is only meant to be loaded on qemu according to: 6af89812e8a9931ffed63768ed85367519bf7aef Since genericx86-common.inc includes qemuboot-x86, the module also tries to be loaded on genericx86 machines, this patch removes the instruction from qemuboot-x86 and adds it in specific to both qemux86 machines confs so it is correctly loaded only on those. [YOCTO #11879] (From OE-Core rev: 261f9c382121c73b72556a151fdd4c7938b32a92) (From OE-Core rev: 554903483acb4af402feaba013366388db89e36b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86 qemux86-64: Enable pciHe Zhe2017-08-091-1/+1
| | | | | | | | | | lspci and some other software require "pci" in MACHINE_FEATURES and PCI is valid in the qemux86* context. (From OE-Core rev: aec9a159dbc7a78953da73ba9dfccc9e9c9514a7) Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86*.conf: changed dependency task for syslinuxEd Bartosh2017-04-101-1/+1
| | | | | | | | | | | | | | | | | | Changed dependency task for syslinux from do_build to do_populate_sysroot as do_build dependency caused conflicts in populating image recipe sysroot using conflicting recipes. This makes do_image_wic task to fail with FileExistsError trying to copy the same file from two conflicting recipes. This should also speed up image creation a bit as do_populate_sysroot task is faster than do_build. [YOCTO #11295] (From OE-Core rev: b7bb02901b7002641a8e8cc3fc0b6ec31e5a21f7) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Use weak assignment for SERIAL_CONSOLES in qemu configuration filesChen Qi2016-12-131-1/+1
| | | | | | | | | | | | | | | | | Use weak assignment for SERIAL_CONSOLES in qemu configuration files so that the value could serve as a default value and could be easily overridden in configuration files like local.conf. When using the default value for SERIAL_CONSOLES in qemux86-64,we would have annoying messages on console complaining about respawning getty on ttyS1. Although the value is set by purpose, at least we need to provide an easy way to override it. (From OE-Core rev: 5f060b66162c41a295995947b918253450870117) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* selftest: wic: fix test_qemuEd Bartosh2016-12-071-1/+1
| | | | | | | | | | | | | | | | Setting WKS_FILE variable in qemux86-64 made wic test to use wrong wks file to produce an image and resulted in test_qemu failure. Used conditional assignment in qemux86-64 and explicitly set WKS_FILE in wic testing suite to make the suite to use wic-image-minimal.wsk. This should fix test_qemu failure. (From OE-Core rev: 3bca4d18c2712e3b154bacfb917f0a749ebaddeb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86*.conf: set wic-related parametersEd Bartosh2016-11-301-0/+3
| | | | | | | | | | | | | | | | | Set directdisk.wks as default wks to use for qemux86 machines. Set requried dependeincies to build directdisk image. This should simplify building wic images for qemux86* machines. It should be enough to add wic to the list of IMAGE_FSTYPES to get the images built. [YOCTO #10637, YOCTO #8719] (From OE-Core rev: 8716b8b9be05e3f140bfa426a8e0d4eeaa2edcbe) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf: Use xf86-input-libinput by defaultJussi Kukkonen2016-11-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | Don't install legacy X input drivers for any machines by default, RRECOMMEND xf86-input-libinput instead. This is the setup suggested by upstream: install only libinput by default, but let niche legacy drivers sort higher in configuration so they get chosen if installed. So the order is: evdev < libinput < (synaptics|vmmouse|...) This also removes vmmouse X driver from the qemu config. If a VMware virtual mouse device really needs to be supported, we should enable CONFIG_MOUSE_PS2_VMMOUSE in kernel instead: that is directly supported by the libinput X driver. Fixes [YOCTO #10195]. (From OE-Core rev: 2d005faff6341a81a2afae28860101ba9db51ae8) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86.conf/qemux86-64.conf: set vars for runqemuRobert Yang2016-09-091-0/+1
| | | | | | | | | | Add qemuboot-x86.inc to reduce duplicated code, the x86/x86_64 bsps which can be boot by runqemu can require qemuboot-x86.inc. (From OE-Core rev: b5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xf86-config: pre-load int10 and exa modulesKhem Raj2016-08-231-1/+4
| | | | | | | | | | | | | musl doesn't like lazy loading that xorg uses, therefore load the needed modules explicitly [YOCTO #10169] (From OE-Core rev: e279c9a30f0df400b06a47a487967a734854714b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machine/qemu: Fix OpenGL/GLX support with xserver-xorg.Carlos Alberto Lopez Perez2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | * The Xorg server needs to load the GLX extension in order to enable proper OpenGL support. * Before this patch, glxinfo aborted with: root@qemux86:~# glxinfo name of display: :0.0 Error: couldn't find RGB GLX visual or fbconfig * After this patch, it works as expected: root@qemux86:~# glxinfo | grep " render" direct rendering: Yes OpenGL renderer string: Software Rasterizer (From OE-Core rev: 8f33627684755899c5b1fd7eeefdd89c42e68fec) Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemurunner: Use two serial ports and log console with a threadRandy Witt2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | qemu can freeze and stop responding if the socket buffer connected to a tcp serial connection fills up. This happens of course when the reader of the serial data doesn't actually read it. This happened in the qemurunner code, because after checking for the "login:" sentinel, data was never again read from the serial connection. This patch solves the potential freeze by adding a thread to continuously read the data from the console and log it. So it also will give a full log of the console, rather than just up to the login prompt. To simplify this patch, another serial port was also added to use for the sole purpose of watching for the sentinel as well as being the interactive serial port. This will also prevent the possibility of lots of debug data on the console preventing the sentinel value from being seen due to interleaved text. (From OE-Core rev: 2da3fee6b6d9f4dd4c4cb529f4ba393c20aa0f13) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86-64: support X11 when QEMU is emulating a different GPU than vmwareMax Eliaser2014-08-271-0/+2
| | | | | | | | | | | | | | | | | QEMU is capable of emulating four different VGA adapters: cirrus, std, vmware, and QXL. By adding the cirrus and fbdev X.Org drivers to the qemux86-64 image, the image can be made to launch an X server on when cirrus and std are chosen, in addition to just vmware. (The build of QEMU in OE-Core appears to have QXL disabled, meaning a driver for it is unnecessary.) The runqemu script now allows the choice of emulated VGA adapter to be specified manually, so it's important that qemux86-64 supports any configuration the user might choose without requiring the image to be rebuilt. (From OE-Core rev: 1216de77a7f23fa10e34aee1ebe27fcc6a6589c0) Signed-off-by: Max Eliaser <max.eliaser@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador2014-04-251-1/+1
| | | | | | | | | | | The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86_64: Use the core2-64 tuneDarren Hart2014-01-281-1/+2
| | | | | | | | | | | | | | | | | As x86_64 has been "demoted" to an ABI definition rather than a concrete tune file, replace it with core2-64 for the qemux86-64 machine. (From OE-Core rev: 65c1ba225a410d2ee1913d55c6f986db9f54cc8e) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Paul Eggleton <paul.eggleton@intel.com> Cc: Tom Zanussi <tom.zanussi@intel.com> Cc: Nitin Kamble <nitin.a.kamble@intel.com> Cc: Mark Hatle <mark.hatle@windriver.com> Cc: Bruce Ashfield <bruce.ashfield@windriver.com> Cc: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu: only depend on mesa-driver-swrast if opengl is enabledRoss Burton2013-09-111-1/+1
| | | | | | | | | | As Mesa refuses to compile if the "opengl" DISTRO_FEATURE isn't enabled, mesa-driver-swrast has to be conditional in the QEMU machine defintions too. (From OE-Core rev: 9951e1da6a755f9a46d3a595aa4c2f975aee8f46) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemux86*.conf: replace XSERVER weak assignment with a hard oneLaurentiu Palcu2013-03-271-1/+1
| | | | | | | | | | | | | Because the qemu.inc is now included before the XSERVER assignment, the xf86-video-vmware and xf86-video-vmmouse are not built and the X for qemux86 and qemux86-64 does not start. [YOCTO #4124] (From OE-Core rev: f9c12a42f9777bc66b2ce63a244e655d167025ed) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf/machine: Clean up MACHINEOVERRIDES handlingRichard Purdie2013-03-251-2/+1
| | | | | | | | | | | | | | | | OVERRIDES reads from left to right, least to most specific. We were appending to MACHINEOVERRIDES when we should have been prepending so the ordering of qemuall verses qemuxxx was incorrect, as was the x86 override and several of the arm overrides. This patch is a batch cleanup of the various issues to correct the order from least to most specific. The include order does matter and we needed to tweak some of that in this patch too. [YOCTO #4090] (From OE-Core rev: bdc1b214431c9c93a929b547b9a61e7b87fbd366) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mesa: rename mesa-dri recipe to just mesaLaurentiu Palcu2013-03-221-4/+4
| | | | | | | | | | | | | | | | | Rename mesa-dri recipes to just mesa. Also, replace all references to mesa-dri in all recipes/configs. The reason for this renaming (quote from bugzilla): "mesa-dri is a artefact of mesa-xlib existing, which doesn't anymore. mesa-dri should be renamed to mesa." [YOCTO #3385] (From OE-Core rev: c8bbb9983bcc7cfc5332e89c3e8148505b4ca83f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemugl: Remove since support for it was removed from qemuRichard Purdie2012-10-241-3/+1
| | | | | | (From OE-Core rev: 0195a08f77fe0e01b2d7548ccffeaf89d2d780e1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machines/x86: Drop redundant glibc configure knobsKhem Raj2012-09-101-3/+0
| | | | | | | | | | nptl and thereby tls are not optional anymore (From OE-Core rev: 1a4b277e47a8d624cde4c73713d036e230f3a523) Signed-off-by: Khem Raj <raj.khem@gmail.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 OE-Core rev: 9f83d93c65942f9ed1b25a24976f92ae06c425c8) 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>
* qemumachines: make MACHINE_FEATURES append follow qemu.inc includeTom Zanussi2012-07-041-2/+2
| | | | | | | | | | | | | | | | | | | qemu.inc does a straight assign to MACHINE_FEATURES so overwriting the preceding append to MACHINE_FEATURES, so the MACHINE_FEATURES append needs to be moved after the include. This situation came about as a result of commit 71a4bf386: qemumachines: Enable xserver-xorg as default xserver For qemux86 and qemux86-64 include qemu.inc after defining XSERVER which missed this side-effect (and maybe others). (From OE-Core rev: 4f336e5f416df382fdd2b405314741164d537b22) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemumachines: Enable xserver-xorg as default xserverKhem Raj2012-05-241-1/+2
| | | | | | | | | | | | | | | | | | | | | For qemux86 and qemux86-64 include qemu.inc after defining XSERVER XSERVER variable is also weakly defined in task-core-x11.bb which means we can not use ??= otherwise when building any qemu image that uses task-core-x11.bb will get the wrong definition So we define the XSERVER common set for qemu in qemu.inc and as we know x86 and x86-64 qemu overrides the default we include qemu.inc after that definition which means that qemux86 and qemux86-64 get their own definitions and other qemus get the definitions from qemu.inc. other non-qemu machine will get their defintion from task which points to kdrive as of now. (From OE-Core rev: 62dba36166bc5faa32ba3e0664ae98b168cde6b1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* virtual/libgl: use mesa-xlib for qemuarm/qemumips/qemuppcZhai Edwin2012-03-301-0/+1
| | | | | | | | | | | | Still need mesa-xlib for emulation of GLX interface on qemuarm/mips/ppc, where mesa-dri doesn't work for pure qemu emulator. [YOCTO #2066] fixed. (From OE-Core rev: 22775b5f1d9c6d9860a579245bf7a48a982ab62f) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf/machine: Don't poke around providers which aren't machine specific/safeRichard Purdie2011-12-061-3/+0
| | | | | | | | | | | | Machines shouldn't be poking around PREFERRED_PROVIDERS which aren't machine specific or at least machine safe. Kernels are machine specific and the xserver is selectable. libx11 and mesa are now really a distro choice and machine configurations shouldn't be poking around them as it just leads to corruption, conflicts and confusion. (From OE-Core rev: 97a57aca12437c24b628071bb189c9f3b94e27ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-liteMartin Jansa2011-10-111-3/+3
| | | | | | | | | | | | * xserver-xorg is closer to upstream naming and that's how it's named in OE-classic and meta-oe? It would make meta-oe transition easier and better to do it now then convert meta-oe to xserver-xf86 and then rename it back later. (From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf/qemux86-64: Automate TRANSLATED_TARGET_ARCHRichard Purdie2011-08-031-3/+0
| | | | | | (From OE-Core rev: 6def7129cf7580a935c05cc05b7f803812d5bb18) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* conf/machine/tune: Overhaul tune include file variablesRichard Purdie2011-07-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | There is currently consideradble confusion over how the tune files operate and how these interact with the rest of the build system. This update/overhaul changes things so the tune files are primarily resonsible for setting: TUNE_ARCH - What was formerly set as TARGET_ARCH and is the value that represents the architecture we're targetting. TUNE_PKGARCH - The value that represents the tune confuration that this set of tune parameters results in. This allows the significant improvement that the core can now always determine the target architecture value, even when TARGET_ARCH needs to be reset to something different and likewise, there is one package architecture variable the core can reference allowing simplification of the BASE_PACKAGE_ARCH, PACKAGE_ARCH and FEED_ARCH variables. (From OE-Core rev: a10de4cf8b424ee95c8e283e75d486be5b3b8eac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machine/qemu: Add qemu-config as an essential machine speicfic dependency ↵Richard Purdie2011-05-111-1/+1
| | | | | | | | and drop specific distro config (From OE-Core rev: 617b8f2ae26a6b4ac57795fead39ef20b1f92ecc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* machines: move PACKAGE_EXTRA_ARCHS to tune filesKoen Kooi2011-01-101-1/+0
| | | | | | | | This gets us closer to making including tune-<arch>.inc "just work". Moving the TARGET_ARCH definitions is something for a follup patch. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH.Lianhao Lu2010-12-101-0/+1
| | | | | | | | | | | Using TRANSLATED_TARGET_ARCH instead of TARGET_ARCH for cross-canadian packages. This is due to the TARGET_ARCH of x86_64 would results incorrect packaging in cross-canadian packages. The pacakge name appendix of x86_64 target in cross-canadian packages is x86-64. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
* qemux86-64: remove -march for 64bit common pcQing He2010-09-271-1/+1
| | | | | | Fixes [BUGID #347]. Signed-off-by: Qing He <qing.he@intel.com>
* qemux86-64: Add new emulation machine for 64bit x86Richard Purdie2010-07-271-0/+35
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 09:58:52 +0000