Commit Graph

423 Commits

Author SHA1 Message Date
Martin Jansa
689097cdf3 qemu-native: add direct dependency on ninja-native and meson-native
* with many native dependencies excluded in:
  layer.conf: Extend recipes not to install without explict dependencies
  this was now failing with:
  ERROR: Cannot find Ninja
  and after adding ninja-native to DEPENDS it was failing due to missing meson as well:
  /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qemu-native/6.0.0-r0/qemu-6.0.0/configure: 6415: --version: not found
  /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qemu-native/6.0.0-r0/qemu-6.0.0/configure: 6418: setup: not found

(From OE-Core rev: 7b2dfb49105e6465c5436869863e6a9720c60bbd)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-09-21 23:44:08 +01:00
Sakib Sajal
48960ce562 qemu: fix CVE-2021-3682
(From OE-Core rev: e16cd155c5ef7cfe8b4d3a94485cb7b13fd95036)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-18 17:01:06 +01:00
Chen Qi
2e4d3aa2a3 meta: use new override syntax in comments
(From OE-Core rev: 572e7db6e8831227911ff3e52bde3a4aa6df1c91)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-12 06:26:15 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Lee Chee Yang
8444eacecd qemu: fix CVE-2021-3527
(From OE-Core rev: 6774efd1e3d0bd5c8c34f84dcf4f698d7eafb36a)

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-27 08:38:34 +01:00
Khem Raj
e84de43c6a qemu: Provide float128 via hwcaps2 on ppc64le
Fixes runtime problems with qemu-user
Fatal glibc error: CPU lacks float128 support (POWER 9 or later required)

(From OE-Core rev: 2a2ba9ec4ca1aeb4a1d5336bb18ab76253c87bc0)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-17 00:07:05 +01:00
Ross Burton
d5782204c3 qemu: fix virtio vhost-user-gpu CVEs
Fix a slew of CVEs (CVE-2021-3544, CVE-2021-3545, CVE-2021-3546) by
backporting the relevant patches from qemu's git.

(From OE-Core rev: ce850a5ce84f949d3114024c89ae3dd98fcbef41)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-06-17 00:07:05 +01:00
Richard Purdie
d9aa32dbf9 qemu: Upgrade 5.2.0 -> 6.0.0
Building without PIE support seems broken upstream, enable it by default
to match the configuration others evidently use.

Tweak git submodule option to match upstream.

Drop backported/merged patches, refresh others.

(From OE-Core rev: ede1b86e663f1cafccc8aa8c35fa13ebd3f55d11)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-16 08:29:59 +01:00
Alexander Kanavin
74fbe5578a qemu: backport a patch to fix meson 0.58 builds
(From OE-Core rev: fe6889ed05edf2f1e4ac7b06debd4cc43ebb9607)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-14 07:57:28 +01:00
Richard Purdie
d2708c0b5b qemu: Exclude CVE-2018-18438 from cve-check
The issues were investigated and found not to be an issue therefore
exclude from checks.

(From OE-Core rev: ee6ee9bd489c126b99d15c1011560df2f840a6e9)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-11 11:54:26 +01:00
Richard Purdie
ae3527372f qemu: Exclude CVE-2007-0998 from cve-check
The CVE applies to the built-in VNC server but we don't enable this by default.

(From OE-Core rev: d62b9974a5f3a0f462434ce2763c28a4b4bbcfc6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-11 11:54:26 +01:00
Richard Purdie
458f5d026e qemu: Exclude CVE-2017-5957 from cve-check
The CVE applies to virglrender before 0.6.0 which we don't have.

(From OE-Core rev: 9b5355375d028577de0b98e05992de6a088cb972)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-11 11:54:26 +01:00
Anuj Mittal
e3d054cd62 qemu: fix CVE-2021-3392
(From OE-Core rev: a0257aee7d80fc67c92877e2de1e4b98ece54174)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-06 08:41:26 +01:00
Anuj Mittal
db4d9619aa Revert "qemu: fix CVE-2021-3392"
This reverts commit 5e8e08df8b.

This is an incomplete fix.

(From OE-Core rev: 2e7494cd388c5d03a95d8a54d6231e7fe7fd46ef)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-06 08:41:26 +01:00
Sakib Sajal
dad4cfaca3 qemu: fix CVE-2021-20263
virtiofs: drop remapped security.capability xattr as needed

(From OE-Core rev: 7ad71de89dd60700cbaad2df1937bc3d743112da)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-04 22:48:16 +01:00
Sakib Sajal
9f31c9ebeb qemu: fix CVE-2020-27821
memory: clamp cached translation in case it points to an MMIO region

(From OE-Core rev: df92b3359743ed1837fa57df8035d121f5c5676b)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-04 22:48:16 +01:00
Minjae Kim
5e8e08df8b qemu: fix CVE-2021-3392
scsi: use-after-free in mptsas_process_scsi_io_request() of mptsas1068 emulator
(From OE-Core rev: 97ec10a1d7111dafde8609176ffa9e13cc1b8f1f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-05-01 22:48:17 +01:00
Saul Wold
3acbec85b0 qemurunner: Add support for qmp commands
This adds support for the Qemu Machine Protocol [0] extending
the current dump process for Host and Target. The commands are
added in the testimage.bbclass.

Currently, we setup qemu to stall until qmp gets connected and
sends the initialization and continue commands, this works
correctly. If the UNIX Socket does not exist, we wait an timeout
to ensure to socket file is created.

With this version, the monitor_dumper is created in OEQemuTarget
but then set in OESSHTarget as that's where we get the SSH failure
happens. Python's @property is used to create a setter/getter type
of setup in OESSHTarget to get overridden by OEQemuTarget.

By default the data is currently dumped to files for each command in
TMPDIR/log/runtime-hostdump/<date>_qmp/unknown_<seq>_qemu_monitor as
this is the naming convenstion in the dump.py code.

We use the qmp.py from qemu, which needs to get installed in the
recipe-sysroot-native of the target image.

[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt

(From OE-Core rev: 42af4cd2df72fc8ed9deb3fde4312909842fcf91)

Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-27 15:11:47 +01:00
Saul Wold
2c86aba6f0 qemu-system-native: install qmp python module
The qmp python module supports the Qemu Machine Protocol [0].
This module needs to be installed in a known location so the
qemurunner python script can find the qmp module.

This change causes it to be installed in the recipe-sysroot-native
of the target image and that directory can be added to the python
sys.path that needs to use the qmp.py module.

[0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt

(From OE-Core rev: 46a60f67562a6ae227e018228212fc797d1f2795)

Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-27 15:11:47 +01:00
Armin Kuster
f7c278c330 qemu: Enable seccomp if FEATURE is set
(From OE-Core rev: c057509306319cc0c2c7ef89154995ffd96c5646)

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-26 14:14:42 +01:00
Sakib Sajal
dcfdecb9ff qemu: fix CVE-2021-20257
(From OE-Core rev: 547ac986a74cfcae39b691ebb92aadc8436443ea)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-24 17:53:05 +01:00
Sakib Sajal
4284f80d1f qemu: fix CVE-2021-3416
(From OE-Core rev: e2b5bc11d1b26b73b62e1a63cb75572793282dcb)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-24 17:53:05 +01:00
Sakib Sajal
ea7850cd83 qemu: fix CVE-2021-3409
(From OE-Core rev: e2fb8c15a64e1f5db678e8e95924da8c88a188c0)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-24 17:53:05 +01:00
Sakib Sajal
2c01852bcb qemu: fix CVE-2021-20221
(From OE-Core rev: 59a44f8c70d4a026ae74e44b9d70100029c691b5)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-24 17:53:05 +01:00
Sakib Sajal
5c59b634a2 qemu: fix CVE-2020-29443
(From OE-Core rev: 481e012de865ee232fa5a233e9f1d4fc7a2232ab)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-24 17:53:05 +01:00
Sakib Sajal
640c6d1191 qemu: fix CVE-2021-20181
(From OE-Core rev: c2f79065ef0684f2c0bdb92f1b03e690ab730b8c)

Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-24 17:53:05 +01:00
Khairul Rohaizzat Jamaluddin
b50e51b1c8 qemu: Fix CVE-2020-35517
CVE:
CVE-2020-35517

(From OE-Core rev: 51376edb13eed748395ebe1e56081c092565be9b)

Signed-off-by: Khairul Rohaizzat Jamaluddin <khairul.rohaizzat.jamaluddin@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-04-18 11:37:24 +01:00
Minjae Kim
c59fa5d062 qemu: fix CVE-2021-20203
net: vmxnet3: validate configuration values during activate

Upstream-Status: Acepted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg07935.html]
CVE: CVE-2021-20203
(From OE-Core rev: 20d9e13372c4878a87488ea4e470b6ccea3e9dbc)

Signed-off-by: Minjae Kim <flowergom@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-11 14:00:36 +00:00
Richard Purdie
0dee498104 qemu: Determinism fixes
Add a patch to address two determinism issues and allow reproducible
builds.

Also strip full paths we don't need out of some ptest files,
we can use the installed binaries.

(From OE-Core rev: 14e7cc6c6040b983024bec56fbd32d9101507ff0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-02 14:15:34 +00:00
Richard Purdie
2e4eaa5701 qemu: Refresh mmap fixes patch status/content
One mmap patch was merged upstream, the other is in progress but after
discussion has been amended and resent. Update the patches as such.

(From OE-Core rev: c68349a3334542e51f6c1c23f4f4342e4fce2b81)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-17 11:01:17 +00:00
Mingli Yu
03bf6b3ec0 qemu: make ptest rework
After qemu upgrades to 5.2.0 in commit [1], if also switches
to meson and the previous logic which introduces the testsuites
changes in [2] and results in below error when run ptest test:
 # ./run-ptest
 for f in ; do \
     nf=$(echo $f | sed 's/tests\//\.\//g'); \
     $nf; \
 done

So refactor the ptest part code to make it work again.

[1] https://git.openembedded.org/openembedded-core/commit/?id=181c635567aafb9b4787d8d6d0bcd4a615ceae80
[2] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=279588d4deea2694ebe9ceb29dfdc5c08a7c4e27

(From OE-Core rev: a5c1290e8a24b844f0ba62df270f976096394d87)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-05 08:16:32 +00:00
Tomasz Dziendzielski
a2a34451c9 meta: Fix native inheritance order in recipes
Classes native/nativesdk should be inherited last to prevent unexpected
behaviour.

See [YOCTO #5729] for details.

(From OE-Core rev: 217a8974765693192cbead51ebd9845a383ef7cc)

Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-27 10:17:45 +00:00
Changqing Li
2e4c20d4cc qemu: fix do_compile error
Fix error like:
Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long

(From OE-Core rev: e125430dea6e5eba5587f56602b006c90ab16509)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-16 22:39:35 +00:00
Richard Purdie
c56cafbc9b qemu: Add some user space mmap tweaks to address musl 32 bit build issues
(From OE-Core rev: 18a37fcd7c0a64a339d1eea88b16ba75c017c5d5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-09 09:09:50 +00:00
Richard Purdie
d09b003052 qemu: Fix mingw builds
After the recent upgrade, mingw builds failed. Add a hack whilst a solution
is discussed upstream.

(From OE-Core rev: 967c6767eacab1951ae710666c588551102be5a3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-09 09:09:50 +00:00
Richard Purdie
7cb670c4a9 qemu: Drop vm reservation changes to resolve build issues
When building with the new version of qemu we see errors like:

"""
qemu-i386: Unable to reserve 0x7ffff000 bytes of virtual address space at
0x1000 (Success) for use as guest address space (check your virtual memory
ulimit setting, min_mmap_addr or reserve less using -R option)

ERROR: The postinstall intercept hook 'update_gio_module_cache-nativesdk' failed
"""

The VM reseration patches we're carrying look suspicious in this context.
Drop them since the patches appear to be a liability causing other issues
and there is a much  simpler fix for the webkitgtk issues on musl on
32 bit (see later linux-user mmap patches).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
(From OE-Core rev: 8a0efb16ca7cf22902fac743718c776b57c6d2f6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-09 09:09:50 +00:00
Richard Purdie
0d298198e5 qemu: Upgrade 5.1.0->5.2.0
This involves some pretty major changes for qemu. In particular, they
switched to meson+ninja so we have to adapt to that.

Patch changes:
* CVE patches - dropped as backports
* cflags fix - upstream code changed significantly, need new patch if still issues
* mips TLB entries - dropped as merged upstream
* usb fix - dropped as merged upstream
* find_datadir - dropped as code no longer present that I could find

A patch was added to allow us to force the configure script into "cross" mode
without setting cross_prefix which has other effects we don't need/want.

Dependencies on meson/ninja were added.

Specifying the python interpreter causes the internal meson copy to be
built/used which is undesireable for us so don't do that. The correct
python is in PATH anyway.

Acked-by: Alistair Francis <alistair.francis@wdc.com>
(From OE-Core rev: 181c635567aafb9b4787d8d6d0bcd4a615ceae80)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-09 09:09:49 +00:00
Li Wang
16cd1024be qemu: CVE-2020-28916
References:
https://nvd.nist.gov/vuln/detail/CVE-2020-28916

backport patch from:
https://git.qemu.org/?p=qemu.git;a=commit;h=c2cb511634012344e3d0fe49a037a33b12d8a98a

(From OE-Core rev: cbc20b9d8d119bfd777f83432c760dcdb94f07f9)

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-03 08:58:26 +00:00
Li Wang
2b2431625c qemu: CVE-2020-25723
References:
https://nvd.nist.gov/vuln/detail/CVE-2020-25723
https://bugzilla.redhat.com/show_bug.cgi?id=1898579

backport patch from:
https://git.qemu.org/?p=qemu.git;a=commit;h=2fdb42d840400d58f2e706ecca82c142b97bcbd6

(From OE-Core rev: 3a52f12bd08bd6f0e386c78f9f87acacdb7714cb)

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-03 08:58:26 +00:00
Nathan Rossi
38ff3dd502 qemu.inc: Add seccomp PACKAGECONFIG option
Add the seccomp PACKAGECONFIG option to allow building seccomp features
in QEMU. The libseccomp library is available in additional layers (e.g.
meta-security).

Additionally this serves as a way to disable seccomp by default to avoid
the configure of QEMU automatically finding it (via pkg-config) on the
build host when building qemu-system-native and auto enabling the
feature.

(From OE-Core rev: 7c8245f41d43b5a267d51f3c7784536eee23fca2)

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-18 22:52:24 +00:00
Li Wang
3ac2ba83f2 qemu: CVE-2020-25624
References:
https://nvd.nist.gov/vuln/detail/CVE-2020-25624

backport patch from:
https://git.qemu.org/?p=qemu.git;a=commit;h=1328fe0c32d5474604105b8105310e944976b058

(From OE-Core rev: 88d05be28da522fb390ee24f2871a113adf4366e)

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-06 23:17:28 +00:00
Li Wang
f107844a62 qemu: CVE-2020-29129 CVE-2020-29130
References:
https://nvd.nist.gov/vuln/detail/CVE-2020-29129
https://nvd.nist.gov/vuln/detail/CVE-2020-29130

backport patch from:
https://git.qemu.org/?p=libslirp.git;a=commit;h=2e1dcbc0c2af64fcb17009eaf2ceedd81be2b27f

(From OE-Core rev: e5eda809a41732dfa4988799360be3d1280c1209)

Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-03 22:53:09 +00:00
Lee Chee Yang
af3208397c qemu: fix CVE-2020-24352
(From OE-Core rev: 9129911214126d792e0dba349e9b1ab79b568237)

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-11-24 10:27:45 +00:00
Victor Kamensky
67377bbd0b qemu: change TLBs number to 64 in 34Kf mips cpu model
Replace OE private qemu patch with one that got upstreamed
and solves the same problem: increase qemumips CI performance
by increasing number of TLBs in CPU model and reduce need to
run software TLB refill code.

(From OE-Core rev: a99dace7463d310688f4098a51316dc0743651e2)

Signed-off-by: Victor Kamensky <kamensky@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-20 11:11:46 +01:00
Victor Kamensky
c2adcca4bf Revert "qemu: add 34Kf-64tlb fictitious cpu type"
This reverts commit 4470a04943352224955f17e004962f0f9e1c9b0c.

Will be replaced with upstreamed solution instead, that just
bumped number of TLBs to 64 in original 34Kf CPU model.

(From OE-Core rev: 894f1d58d93073d290f35d1090b03717bc7b4dc0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-20 11:11:46 +01:00
Victor Kamensky
f6f5d09205 qemu: add 34Kf-64tlb fictitious cpu type
In Yocto Project PR 13992 it was reported that qemumips
in autobuilder runs almost twice slower then qemumips64 and
some times hit time out.

Upon investigations of qemu-system with perf, gdb, and
SystemTap and comparing qemumips and qemumips64 machines
behavior it was noticed that qemu soft mmu code behaves
quite different and in case if qemumips tlbwr instruction
called 16 times more oftern. It happens that in qemumips64
case qemu runs with cpu type that contains 64 TLB, but in case
of qemumips qemu runs with cpu type that contains only
16 TLBs.

The idea of proposed qemu patch is to introduce fictitious
34Kf-64tlb cpu type that defined exactly as 34Kf but has
64 TLBs, instead of original 16 TLBs.

Testing of core-image-full-cmdline:do_testimage with
34Kf-64tlb shows 40% or so test execution real time
improvement.

Note for future porters of the patch: easiest way to update
the patch and be in sync with 34Kf definition is to copy
34Kf machine definition and apply the following changes to
it (just change 15 to 63 of CP0C1_MMU bits value)

[kamensky@coreos-lnx2 qemu]$ diff ~/34Kf.c ~/34Kf-64tlb.c
2c2
<         .name = "34Kf",
>         .name = "34Kf-64tlb",
6c6
<         .CP0_Config1 = MIPS_CONFIG1 | (1 << CP0C1_FP) | (15 << CP0C1_MMU) |
>         .CP0_Config1 = MIPS_CONFIG1 | (1 << CP0C1_FP) | (63 << CP0C1_MMU) |

Fixes https://bugzilla.yoctoproject.org/show_bug.cgi?id=13992

Upstream Status: Inappropriate

(From OE-Core rev: 4470a04943352224955f17e004962f0f9e1c9b0c)

Signed-off-by: Victor Kamensky <kamensky@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-08 11:28:58 +01:00
Jon Mason
ceefa75ac0 Space-comma Cleanups
Multiple files have " ," instead of ", " in expressions.  This changes
them to conform to the way the rest of them are done.

Found and corrected via:
git ls-files | xargs sed --follow-symlinks -i 's/ ,d/, d/g'

(From OE-Core rev: 36c3afd2dd8bded02ea8f255e89a09ebd75c795b)

Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-30 15:01:51 +01:00
Ross Burton
bb759f56f6 meta: add/fix invalid Upstream-Status tags
(From OE-Core rev: 630ce8130598e2bca7231ac28a7cc18b5b942544)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-23 20:54:03 +01:00
Mingli Yu
565d243a1d qemu: override DEBUG_BUILD
Override DEBUG_BUILD for qemu as the qemu upstream states it
doesn't work without optimization [1] to fix below build failure
when debug build enabled.
 | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:25: undefined reference to `unknown_lock_type'
 | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o: in function `fsdev_co_throttle_request':
 | /mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: undefined reference to `unknown_lock_type'
 | /usr/lib/gcc/x86_64-wrs-linux/10.1.0/../../../../x86_64-wrs-linux/bin/ld.bfd: ../fsdev/qemu-fsdev-throttle.o:/mnt/build/tmp/work/x86_64-linux/qemu-system-native/5.1.0-r0/qemu-5.1.0/fsdev/qemu-fsdev-throttle.c:103: more undefined references to `unknown_lock_type' follow
 | collect2: error: ld returned 1 exit status

[1]: https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html

(From OE-Core rev: 2d6a15cfb12e72ae3d38f6ecf8c6c2e356e0fda8)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-17 09:47:45 +01:00
Richard Purdie
698127e1ab Revert "qemu: always define unknown_lock_type"
This reverts commit e442924d9a.

This was rejected upstream and its been pointed out qemu doesn't work
without optimization.

Instead we should just error if the user attempts to build it without
optimization.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-17 09:47:45 +01:00