[PATCH] travis-ci: Update QEMU RISC-V run command
From: Bin Meng bin.meng@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@windriver.com Signed-off-by: Bin Meng bmeng.cn@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
On Tue, Jun 23, 2020 at 05:34:34AM -0700, Bin Meng wrote:
From: Bin Meng bin.meng@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@windriver.com Signed-off-by: Bin Meng bmeng.cn@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(-)
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!
Hi Tom,
On Tue, Jun 23, 2020 at 9:17 PM Tom Rini trini@konsulko.com wrote:
On Tue, Jun 23, 2020 at 05:34:34AM -0700, Bin Meng wrote:
From: Bin Meng bin.meng@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@windriver.com Signed-off-by: Bin Meng bmeng.cn@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(-)
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
On 6/23/20 7:24 AM, Bin Meng wrote:
Hi Tom,
On Tue, Jun 23, 2020 at 9:17 PM Tom Rini trini@konsulko.com wrote:
On Tue, Jun 23, 2020 at 05:34:34AM -0700, Bin Meng wrote:
From: Bin Meng bin.meng@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@windriver.com Signed-off-by: Bin Meng bmeng.cn@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(-)
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.
On 6/23/20 6:34 AM, Bin Meng wrote:
From: Bin Meng bin.meng@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.
Applied, thanks.
participants (3)
-
Bin Meng -
Stephen Warren -
Tom Rini