Skip to contentSkip to conversation

travis-ci: Update QEMU RISC-V run command

PATCH New Bin Meng 3 participants 5 messages Jun 23, 2020 RISC-V

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/1 travis-ci: Update QEMU RISC-V run command

From: Bin Meng <[email protected]>

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.

---

 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(-)
bin/travis-ci/conf.qemu-riscv32_na +1 -1
index 3eb9880..5aa25e3 100644
@@ -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
bin/travis-ci/conf.qemu-riscv32_spl_na +1 -1
index 9a76a54..c1419c2 100644
@@ -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
bin/travis-ci/conf.qemu-riscv64_na +1 -1
index 65b2096..90ab820 100644
@@ -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
bin/travis-ci/conf.qemu-riscv64_spl_na +1 -1
index c0b961c..c3d3dac 100644
@@ -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
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 travis-ci: Update QEMU RISC-V run command

Quoted 8 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

Quoted 7 lines

---

 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(-)

Note that "travis-ci" is really the wrong subject here, it should be "u-boot-test-hooks" or something so it's more clear to Stephen that it's for him to pick up and not me :) Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200623/2ecff510/attachment.sig>
author
#2 lore raw

PATCH 1/1 travis-ci: Update QEMU RISC-V run command

Hi Tom,

Quoted 19 lines · Tom Rini
Quoted 8 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

Quoted 7 lines

---

 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(-)
Quoted 4 lines

Note that "travis-ci" is really the wrong subject here, it should be "u-boot-test-hooks" or something so it's more clear to Stephen that it's for him to pick up and not me :) Thanks!

I believe the tag was local to u-boot-test-hooks as I see the same tag was used in various commits in u-boot-test-hooks repo. Maybe we should set up a separate ML for u-boot-test-hooks?

Regards,
Bin

#3 lore raw

PATCH 1/1 travis-ci: Update QEMU RISC-V run command

Quoted 22 lines · Bin Meng

Hi Tom,

Quoted 19 lines · Tom Rini
Quoted 15 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

---

 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(-)
Quoted 8 lines
Quoted 4 lines

Note that "travis-ci" is really the wrong subject here, it should be "u-boot-test-hooks" or something so it's more clear to Stephen that it's for him to pick up and not me :) Thanks!

I believe the tag was local to u-boot-test-hooks as I see the same tag was used in various commits in u-boot-test-hooks repo. Maybe we should set up a separate ML for u-boot-test-hooks?

I don't think the patch volume is large enough to warrant a whole separate email list. So long as patches are sent to/cc me I'll see them without issue.

#4 lore raw

PATCH 1/1 travis-ci: Update QEMU RISC-V run command

In reply to Bin Meng
Quoted 5 lines · Bin Meng

From: Bin Meng <[email protected]>

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.

Applied, thanks.