summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch30
-rw-r--r--meta/recipes-devtools/qemu/qemu_0.14.0.bb3
2 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch b/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch
new file mode 100644
index 0000000000..3b460d04ce
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.14.0/arm-bgr.patch
@@ -0,0 +1,30 @@
1After kernel commit:
2
3http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-3.0/commit/?h=meta&id=9728c1b6a724daefc413b44e10253cdbb5e06d08
4
5It appears that the emulated colours in qemu are incorrect and that
6the red and blue channels are reversed. This patch reverses that logic
7so the colours are correctly displayed on the versatile platform which
8doesn't support the BGR bit.
9
10RP 16/9/2011
11
12Upstream-status: Pending
13
14Index: qemu-0.14.0/hw/pl110.c
15===================================================================
16--- qemu-0.14.0.orig/hw/pl110.c 2011-09-16 14:45:34.228668514 +0100
17+++ qemu-0.14.0/hw/pl110.c 2011-09-16 15:17:22.458671206 +0100
18@@ -141,7 +141,11 @@
19 fprintf(stderr, "pl110: Bad color depth\n");
20 exit(1);
21 }
22- if (s->cr & PL110_CR_BGR)
23+
24+ if (s->versatile && s->bpp == BPP_16)
25+ /* Code assumes BPP_16 == 565 and BGR is never set on the versatile in 565 mode */
26+ bpp_offset = 0;
27+ else if (s->cr & PL110_CR_BGR)
28 bpp_offset = 0;
29 else
30 bpp_offset = 18;
diff --git a/meta/recipes-devtools/qemu/qemu_0.14.0.bb b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
index 055321ec3e..03519ad7d4 100644
--- a/meta/recipes-devtools/qemu/qemu_0.14.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.14.0.bb
@@ -3,7 +3,7 @@ require qemu.inc
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 5
6PR = "r2" 6PR = "r3"
7 7
8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" 8FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
9FILESDIR = "${WORKDIR}" 9FILESDIR = "${WORKDIR}"
@@ -19,6 +19,7 @@ SRC_URI = "\
19 file://spice-qxl-locking-fix-for-qemu-kvm.patch \ 19 file://spice-qxl-locking-fix-for-qemu-kvm.patch \
20 file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \ 20 file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \
21 file://larger_default_ram_size.patch \ 21 file://larger_default_ram_size.patch \
22 file://arm-bgr.patch \
22 " 23 "
23 24
24# Only use the GL passthrough patches for native/nativesdk versions 25# Only use the GL passthrough patches for native/nativesdk versions