From: Tom Rini <trini@konsulko.com>
Date: Sat, 11 Jan 2020 13:07:03 +0000 (-0500)
Subject: travis: Switch to QEMU v4.2.0 globally
X-Git-Tag: v2020.04-rc1~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=88366b96ee0d8640b2af53e4026dbaeed0fab5e0;p=oweals%2Fu-boot.git

travis: Switch to QEMU v4.2.0 globally

Given our tests in GitLab / Azure we can use QEMU v4.2.0 for all
platforms now.

Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/.travis.yml b/.travis.yml
index 5da046ca7e..3991eb7716 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,7 @@ env:
     - BUILD_DIR=build
     - HOSTCC="cc"
     - HOSTCXX="c++"
-    - QEMU_VERSION="v3.1.0"
+    - QEMU_VERSION="v4.2.0"
 
 before_script:
   # install toolchains based on TOOLCHAIN} variable
@@ -410,14 +410,12 @@ matrix:
         - TEST_PY_BD="evb-ast2500"
           TEST_PY_ID="--id qemu"
           QEMU_TARGET="arm-softmmu"
-          QEMU_VERSION="506179e42112be77bfd071f050b15762d3b2cd43"
           BUILDMAN="^evb-ast2500$"
     - name: "test/py vexpress_ca15_tc2"
       env:
         - TEST_PY_BD="vexpress_ca15_tc2"
           TEST_PY_ID="--id qemu"
           QEMU_TARGET="arm-softmmu"
-          QEMU_VERSION="v3.0.0"
           BUILDMAN="^vexpress_ca15_tc2$"
     - name: "test/py vexpress_ca9x4"
       env: