From patchwork Tue Jun 23 12:34:34 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Bin Meng <bmeng.cn@gmail.com>
X-Patchwork-Id: 242806
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: bmeng.cn at gmail.com (Bin Meng)
Date: Tue, 23 Jun 2020 05:34:34 -0700
Subject: [PATCH] travis-ci: Update QEMU RISC-V run command
Message-ID: <1592915674-18839-1-git-send-email-bmeng.cn@gmail.com>

From: Bin Meng <bin.meng at windriver.com>

Explicitly pass the "-bios" option to QEMU to run U-Boot, instead
of the "-kernel" option, as we know that "-bios" behavior will be
changed since QEMU 5.1.0.

Signed-off-by: Bin Meng <bin.meng at windriver.com>
Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
---

 bin/travis-ci/conf.qemu-riscv32_na     | 2 +-
 bin/travis-ci/conf.qemu-riscv32_spl_na | 2 +-
 bin/travis-ci/conf.qemu-riscv64_na     | 2 +-
 bin/travis-ci/conf.qemu-riscv64_spl_na | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/travis-ci/conf.qemu-riscv32_na b/bin/travis-ci/conf.qemu-riscv32_na
index 3eb9880..5aa25e3 100644
--- a/bin/travis-ci/conf.qemu-riscv32_na
+++ b/bin/travis-ci/conf.qemu-riscv32_na
@@ -6,6 +6,6 @@ console_impl=qemu
 qemu_machine="virt"
 qemu_binary="qemu-system-riscv32"
 qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0"
-qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
+qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot"
 reset_impl=none
 flash_impl=none
diff --git a/bin/travis-ci/conf.qemu-riscv32_spl_na b/bin/travis-ci/conf.qemu-riscv32_spl_na
index 9a76a54..c1419c2 100644
--- a/bin/travis-ci/conf.qemu-riscv32_spl_na
+++ b/bin/travis-ci/conf.qemu-riscv32_spl_na
@@ -6,6 +6,6 @@ console_impl=qemu
 qemu_machine="virt"
 qemu_binary="qemu-system-riscv32"
 qemu_extra_args="-smp 4 -m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0"
-qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/spl/u-boot-spl -device loader,file=${U_BOOT_BUILD_DIR}/u-boot.itb,addr=0x80200000"
+qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/spl/u-boot-spl -device loader,file=${U_BOOT_BUILD_DIR}/u-boot.itb,addr=0x80200000"
 reset_impl=none
 flash_impl=none
diff --git a/bin/travis-ci/conf.qemu-riscv64_na b/bin/travis-ci/conf.qemu-riscv64_na
index 65b2096..90ab820 100644
--- a/bin/travis-ci/conf.qemu-riscv64_na
+++ b/bin/travis-ci/conf.qemu-riscv64_na
@@ -6,6 +6,6 @@ console_impl=qemu
 qemu_machine="virt"
 qemu_binary="qemu-system-riscv64"
 qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0"
-qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot"
+qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot"
 reset_impl=none
 flash_impl=none
diff --git a/bin/travis-ci/conf.qemu-riscv64_spl_na b/bin/travis-ci/conf.qemu-riscv64_spl_na
index c0b961c..c3d3dac 100644
--- a/bin/travis-ci/conf.qemu-riscv64_spl_na
+++ b/bin/travis-ci/conf.qemu-riscv64_spl_na
@@ -6,6 +6,6 @@ console_impl=qemu
 qemu_machine="virt"
 qemu_binary="qemu-system-riscv64"
 qemu_extra_args="-smp 4 -m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-device,netdev=net0"
-qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/spl/u-boot-spl -device loader,file=${U_BOOT_BUILD_DIR}/u-boot.itb,addr=0x80200000"
+qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/spl/u-boot-spl -device loader,file=${U_BOOT_BUILD_DIR}/u-boot.itb,addr=0x80200000"
 reset_impl=none
 flash_impl=none