diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-06-01 10:29:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-07 08:52:55 +0100 |
commit | f8ec8e89bbe913dd8afcf5136efc64a1d2793a8f (patch) | |
tree | 899b05ba8ceb6a5655c76a5ef095b95c20a87ed0 /meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch | |
parent | 1c7ad49bfd3e60c44281a8f49d69f4b96c359703 (diff) | |
download | poky-f8ec8e89bbe913dd8afcf5136efc64a1d2793a8f.tar.gz |
qemu: upgrade to 2.12.0
* drop patches which are now included upstream
* revert "linux-user: fix mmap/munmap/mprotect/mremap/shma" which is
causing
0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch
to stop working and qemu-i386 hanging during gobject-introspection in
webkitgtk when building for qemux86 with musl
(From OE-Core rev: e9d6e09bb51a857ce248f45124548d338a350ba1)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 4f28e1676b..5152dcafe5 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ad70fdcaf75084da2e02474c61d1d441ca100ab2 Mon Sep 17 00:00:00 2001 | 1 | From dd4404a334a545e9beafa1b1e41b3a8f35ef31a9 Mon Sep 17 00:00:00 2001 |
2 | From: Jason Wessel <jason.wessel@windriver.com> | 2 | From: Jason Wessel <jason.wessel@windriver.com> |
3 | Date: Fri, 28 Mar 2014 17:42:43 +0800 | 3 | Date: Fri, 28 Mar 2014 17:42:43 +0800 |
4 | Subject: [PATCH] qemu: Add addition environment space to boot loader | 4 | Subject: [PATCH] qemu: Add addition environment space to boot loader |
@@ -18,10 +18,10 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 19 | ||
20 | diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c | 20 | diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c |
21 | index ec6af4a..6e76166 100644 | 21 | index f6513a4fd5..d5efafb1e8 100644 |
22 | --- a/hw/mips/mips_malta.c | 22 | --- a/hw/mips/mips_malta.c |
23 | +++ b/hw/mips/mips_malta.c | 23 | +++ b/hw/mips/mips_malta.c |
24 | @@ -61,7 +61,7 @@ | 24 | @@ -62,7 +62,7 @@ |
25 | 25 | ||
26 | #define ENVP_ADDR 0x80002000l | 26 | #define ENVP_ADDR 0x80002000l |
27 | #define ENVP_NB_ENTRIES 16 | 27 | #define ENVP_NB_ENTRIES 16 |