diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-28 09:21:31 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-12-28 09:22:54 +0100 |
commit | e20a680e830e4920d3070360c3666c45a0a53e81 (patch) | |
tree | 1c78a05c94857428006a8a150aeed770f6bbe358 /package/qemu/patches | |
parent | 54c391836b04d7a19a435f89ba617a2ffe06117b (diff) |
qemu: fix host build
Diffstat (limited to 'package/qemu/patches')
-rw-r--r-- | package/qemu/patches/patch-pixman_Makefile_am | 8 | ||||
-rw-r--r-- | package/qemu/patches/qemu-2.1.0-m68k.patch | 34 |
2 files changed, 0 insertions, 42 deletions
diff --git a/package/qemu/patches/patch-pixman_Makefile_am b/package/qemu/patches/patch-pixman_Makefile_am deleted file mode 100644 index 7f5706549..000000000 --- a/package/qemu/patches/patch-pixman_Makefile_am +++ /dev/null @@ -1,8 +0,0 @@ ---- qemu-2.2.0.orig/pixman/Makefile.am 2014-12-09 15:46:29.000000000 +0100 -+++ qemu-2.2.0/pixman/Makefile.am 2015-01-01 16:42:09.000000000 +0100 -@@ -1,4 +1,4 @@ --SUBDIRS = pixman demos test -+SUBDIRS = pixman - - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA=pixman-1.pc diff --git a/package/qemu/patches/qemu-2.1.0-m68k.patch b/package/qemu/patches/qemu-2.1.0-m68k.patch deleted file mode 100644 index b976c058b..000000000 --- a/package/qemu/patches/qemu-2.1.0-m68k.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- qemu-2.2.0.orig/hw/m68k/mcf_intc.c 2014-12-09 15:45:41.000000000 +0100 -+++ qemu-2.2.0/hw/m68k/mcf_intc.c 2014-12-31 21:02:29.000000000 +0100 -@@ -65,6 +65,10 @@ static uint64_t mcf_intc_read(void *opaq - return (uint32_t)(s->ifr >> 32); - case 0x14: - return (uint32_t)s->ifr; -+ /* Reading from SIMR and CIMR return 0 */ -+ case 0x1c: -+ case 0x1d: -+ return 0; - case 0xe0: /* SWIACK. */ - return s->active_vector; - case 0xe1: case 0xe2: case 0xe3: case 0xe4: -@@ -102,6 +106,20 @@ static void mcf_intc_write(void *opaque, - case 0x0c: - s->imr = (s->imr & 0xffffffff00000000ull) | (uint32_t)val; - break; -+ /* SIMR allows to easily mask interrupts */ -+ case 0x1c: -+ if (val & 0x40) -+ s->imr = ~0ull; -+ else -+ s->imr |= (1 << (val & 0x3f)); -+ break; -+ /* CIMR allows to easily unmask interrupts */ -+ case 0x1d: -+ if (val & 0x40) -+ s->imr = 0ull; -+ else -+ s->imr &= ~(1 << (val & 0x3f)); -+ break; - default: - hw_error("mcf_intc_write: Bad write offset %d\n", offset); - break; |