host-qemu: version bump 1.4.1 -> 1.5.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 8 insertions, 104 deletions

diff --git a/patches/qemu-1.4.1/0001-hw-pflash_cfi01-Make-read-after-byte-write-or-erase-.patch b/patches/qemu-1.4.1/0001-hw-pflash_cfi01-Make-read-after-byte-write-or-erase-.patch
deleted file mode 100644
index 2d862fa5f..000000000
--- a/patches/qemu-1.4.1/0001-hw-pflash_cfi01-Make-read-after-byte-write-or-erase-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a565378a8f2be201060caf1c51cdbf7e70a14c3a Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Thu, 28 Feb 2013 18:23:12 +0000
-Subject: [PATCH 1/2] hw/pflash_cfi01: Make read after byte-write or erase
- return status
-
-The Intel flash command set requires that a read operation after
-doing a 'single byte write' command returns the status register;
-add this case to pflash_read() so we return the correct information.
-Similarly, the case for the 0x28 flavour of block erase was missing.
-
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
-Tested-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
-Message-id: 1358777318-7579-2-git-send-email-peter.maydell@linaro.org
----
- hw/pflash_cfi01.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
-index 9e6ff52..c79e599 100644
---- a/hw/pflash_cfi01.c
-+++ b/hw/pflash_cfi01.c
-@@ -162,7 +162,10 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset,
-         }
- 
-         break;
-+    case 0x10: /* Single byte program */
-     case 0x20: /* Block erase */
-+    case 0x28: /* Block erase */
-+    case 0x40: /* single byte program */
-     case 0x50: /* Clear status register */
-     case 0x60: /* Block /un)lock */
-     case 0x70: /* Status Register */
--- 
-1.7.10.4
-
diff --git a/patches/qemu-1.4.1/0002-hw-pflash_cfi01-Treat-read-in-unknown-command-state-.patch b/patches/qemu-1.4.1/0002-hw-pflash_cfi01-Treat-read-in-unknown-command-state-.patch
deleted file mode 100644
index f469937b0..000000000
--- a/patches/qemu-1.4.1/0002-hw-pflash_cfi01-Treat-read-in-unknown-command-state-.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d76742f0b1010f62dd99a75e68b3557b8b8d881c Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Thu, 28 Feb 2013 18:23:12 +0000
-Subject: [PATCH 2/2] hw/pflash_cfi01: Treat read in unknown command state as
- read
-
-The code for handling the default "unknown command state" case in
-pflash_read in pflash_cfi01.c comments "reset state & treat it as
-a read". However the code doesn't actually do this. Moving the
-default case to the top of the switch so it can fall through into
-the read case brings this file into line with pflash_cfi02 and
-makes the code behave as the comments suggest.
-
-The pflash_cfi01 code has always had this bug -- it was presumably
-introduced when the original author copied the cfi02 code and
-rearranged the order of the switch statement without noticing
-that the default case relied on the fall-through.
-
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
-Tested-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
-Message-id: 1358777318-7579-3-git-send-email-peter.maydell@linaro.org
----
- hw/pflash_cfi01.c |   11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
-index c79e599..123b006 100644
---- a/hw/pflash_cfi01.c
-+++ b/hw/pflash_cfi01.c
-@@ -122,6 +122,12 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset,
-             __func__, offset, pfl->cmd, width);
- #endif
-     switch (pfl->cmd) {
-+    default:
-+        /* This should never happen : reset state & treat it as a read */
-+        DPRINTF("%s: unknown command state: %x\n", __func__, pfl->cmd);
-+        pfl->wcycle = 0;
-+        pfl->cmd = 0;
-+        /* fall through to read code */
-     case 0x00:
-         /* Flash area read */
-         p = pfl->storage;
-@@ -197,11 +203,6 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset,
-         else
-             ret = pfl->cfi_table[boff];
-         break;
--    default:
--        /* This should never happen : reset state & treat it as a read */
--        DPRINTF("%s: unknown command state: %x\n", __func__, pfl->cmd);
--        pfl->wcycle = 0;
--        pfl->cmd = 0;
-     }
-     return ret;
- }
--- 
-1.7.10.4
-
diff --git a/patches/qemu-1.4.1/series b/patches/qemu-1.4.1/series
deleted file mode 100644
index adc121e53..000000000
--- a/patches/qemu-1.4.1/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-hw-pflash_cfi01-Make-read-after-byte-write-or-erase-.patch
-0002-hw-pflash_cfi01-Treat-read-in-unknown-command-state-.patch
diff --git a/rules/host-qemu.make b/rules/host-qemu.make
index ebd265536..3b7d5f009 100644
--- a/rules/host-qemu.make
+++ b/rules/host-qemu.make
@@ -18,8 +18,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_QEMU) += host-qemu
 #
 # Paths and names
 #
-HOST_QEMU_VERSION	:= 1.4.1
-HOST_QEMU_MD5		:= eb2d696956324722b5ecfa46e41f9a75
+HOST_QEMU_VERSION	:= 1.5.0
+HOST_QEMU_MD5		:= b6f3265b8ed39d77e8f354f35cc26e16
 HOST_QEMU		:= qemu-$(HOST_QEMU_VERSION)
 HOST_QEMU_SUFFIX	:= tar.bz2
 HOST_QEMU_URL		:= http://wiki.qemu.org/download/$(HOST_QEMU).$(HOST_QEMU_SUFFIX)
@@ -34,9 +34,7 @@ HOST_QEMU_DIR		:= $(HOST_BUILDDIR)/$(HOST_QEMU)
 # autoconf
 #
 
-HOST_QEMU_TARGETS	:= \
-	$(call ptx/ifdef, PTXCONF_ARCH_X86,,$(PTXCONF_ARCH_STRING)) \
-	$(call ptx/ifdef, PTXCONF_ARCH_X86,i386,)
+HOST_QEMU_TARGETS	:= $(call ptx/ifdef, PTXCONF_ARCH_X86,i386,$(PTXCONF_ARCH_STRING))
 HOST_QEMU_SYS_TARGETS	:= $(patsubst %,%-softmmu,$(HOST_QEMU_TARGETS))
 HOST_QEMU_USR_TARGETS	:= $(patsubst %,%-linux-user,$(HOST_QEMU_TARGETS))
 
@@ -50,13 +48,14 @@ HOST_QEMU_CONF_OPT	:= \
 		$(call ptx/ifdef, PTXCONF_HOST_QEMU_USR,$(HOST_QEMU_USR_TARGETS),) \
 	" \
 	--disable-debug-tcg \
+	--disable-debug-info \
 	--disable-sparse \
 	--disable-werror \
 	--disable-sdl \
+	--disable-gtk \
 	--disable-vnc \
 	--disable-cocoa \
 	--audio-drv-list= \
-	--audio-card-list= \
 	--disable-xen \
 	--disable-brlapi \
 	--disable-curses \
@@ -78,14 +77,16 @@ HOST_QEMU_CONF_OPT	:= \
 	--disable-docs \
 	--disable-vhost-net \
 	--disable-spice \
-	--disable-opengl \
+	--disable-glx \
 	--disable-rbd \
 	--disable-libiscsi \
 	--disable-smartcard-nss \
+	--disable-libusb \
 	--disable-usb-redir \
 	--disable-guest-agent \
 	--disable-seccomp \
 	--disable-glusterfs \
+	--disable-libssh2 \
 	--disable-virtio-blk-data-plane \
 	--disable-tools