[u-boot-test-hooks PATCH 0/4] QEMU Updates
Hi all,
This series updated u-boot-test-hooks to adopt QEMU 9.0.
It also introduced 3 new boards: qemu-arm64be, qemu-xtensa-dc233c and qemu-loongarch64.
This is required for CI changes.
I'm going to respin other series later to utilise those new hooks.
Thanks
Jiaxun Yang (4): qemu-vexpress*: Pass -audio none qemu-arm64be: New board qemu-xtensa-dc233c: New board qemu-loongarch64: New board
bin/travis-ci/conf.qemu-loongarch64_na | 12 ++++++++++++ bin/travis-ci/conf.qemu-xtensa-dc233c_na | 12 ++++++++++++ bin/travis-ci/conf.qemu_arm64be_na | 13 +++++++++++++ bin/travis-ci/conf.vexpress_ca15_tc2_qemu | 2 +- bin/travis-ci/conf.vexpress_ca9x4_qemu | 2 +- py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py | 10 ++++++++++ py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py | 11 +++++++++++ .../u_boot_boardenv_qemu_xtensa_dc233c_na.py | 6 ++++++ 8 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 bin/travis-ci/conf.qemu-loongarch64_na create mode 100644 bin/travis-ci/conf.qemu-xtensa-dc233c_na create mode 100644 bin/travis-ci/conf.qemu_arm64be_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py create mode 100644 py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py create mode 100644 py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py
Those boards have build in sound card which cause problems on CI runner.
Pass -audio none to disable sound card backends.
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com --- bin/travis-ci/conf.vexpress_ca15_tc2_qemu | 2 +- bin/travis-ci/conf.vexpress_ca9x4_qemu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/travis-ci/conf.vexpress_ca15_tc2_qemu b/bin/travis-ci/conf.vexpress_ca15_tc2_qemu index 83d703269377..55e40038b379 100644 --- a/bin/travis-ci/conf.vexpress_ca15_tc2_qemu +++ b/bin/travis-ci/conf.vexpress_ca15_tc2_qemu @@ -21,7 +21,7 @@ console_impl=qemu qemu_machine="vexpress-a15" qemu_binary="qemu-system-arm" -qemu_extra_args="-nographic -m 1G -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" +qemu_extra_args="-nographic -m 1G -audio none -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot" reset_impl=none flash_impl=none diff --git a/bin/travis-ci/conf.vexpress_ca9x4_qemu b/bin/travis-ci/conf.vexpress_ca9x4_qemu index d07be2b12984..b5ed72934c3a 100644 --- a/bin/travis-ci/conf.vexpress_ca9x4_qemu +++ b/bin/travis-ci/conf.vexpress_ca9x4_qemu @@ -21,7 +21,7 @@ console_impl=qemu qemu_machine="vexpress-a9" qemu_binary="qemu-system-arm" -qemu_extra_args="-nographic -m 1G -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" +qemu_extra_args="-nographic -m 1G -audio none -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot" reset_impl=none flash_impl=none
On Tue, 11 Jun 2024 at 15:01, Jiaxun Yang jiaxun.yang@flygoat.com wrote:
Those boards have build in sound card which cause problems on CI runner.
Pass -audio none to disable sound card backends.
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
bin/travis-ci/conf.vexpress_ca15_tc2_qemu | 2 +- bin/travis-ci/conf.vexpress_ca9x4_qemu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/bin/travis-ci/conf.vexpress_ca15_tc2_qemu b/bin/travis-ci/conf.vexpress_ca15_tc2_qemu index 83d703269377..55e40038b379 100644 --- a/bin/travis-ci/conf.vexpress_ca15_tc2_qemu +++ b/bin/travis-ci/conf.vexpress_ca15_tc2_qemu @@ -21,7 +21,7 @@ console_impl=qemu qemu_machine="vexpress-a15" qemu_binary="qemu-system-arm" -qemu_extra_args="-nographic -m 1G -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" +qemu_extra_args="-nographic -m 1G -audio none -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot" reset_impl=none flash_impl=none diff --git a/bin/travis-ci/conf.vexpress_ca9x4_qemu b/bin/travis-ci/conf.vexpress_ca9x4_qemu index d07be2b12984..b5ed72934c3a 100644 --- a/bin/travis-ci/conf.vexpress_ca9x4_qemu +++ b/bin/travis-ci/conf.vexpress_ca9x4_qemu @@ -21,7 +21,7 @@ console_impl=qemu qemu_machine="vexpress-a9" qemu_binary="qemu-system-arm" -qemu_extra_args="-nographic -m 1G -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" +qemu_extra_args="-nographic -m 1G -audio none -net user,tftp=${UBOOT_TRAVIS_BUILD_DIR} -net nic" qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot" reset_impl=none flash_impl=none -- 2.43.0
On Tue, Jun 11, 2024 at 10:00:22PM +0100, Jiaxun Yang wrote:
Those boards have build in sound card which cause problems on CI runner.
Pass -audio none to disable sound card backends.
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
Reviewed-by: Tom Rini trini@konsulko.com
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com --- bin/travis-ci/conf.qemu_arm64be_na | 13 +++++++++++++ py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 bin/travis-ci/conf.qemu_arm64be_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py
diff --git a/bin/travis-ci/conf.qemu_arm64be_na b/bin/travis-ci/conf.qemu_arm64be_na new file mode 100644 index 000000000000..3929636932e6 --- /dev/null +++ b/bin/travis-ci/conf.qemu_arm64be_na @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2024 Jiaxun Yang +# + +console_impl=qemu +qemu_machine="virt" +qemu_helper_script="swtpm" +qemu_binary="qemu-system-aarch64" +qemu_extra_args="-cpu cortex-a57 -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device e1000,netdev=net0 -device virtio-rng-pci -semihosting -chardev socket,id=chrtpm,path=/tmp/tpm/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis-device,tpmdev=tpm0" +qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.bin" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py b/py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py new file mode 100644 index 000000000000..5746b37dbcf5 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py @@ -0,0 +1,10 @@ +import os +import travis_tftp + +env__net_uses_pci = True +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin', 0x40400000) +env__efi_fit_tftp_file = { + 'addr' : 0x40400000, + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +}
On Tue, 11 Jun 2024 at 15:01, Jiaxun Yang jiaxun.yang@flygoat.com wrote:
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
bin/travis-ci/conf.qemu_arm64be_na | 13 +++++++++++++ py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py | 10 ++++++++++ 2 files changed, 23 insertions(+) create mode 100644 bin/travis-ci/conf.qemu_arm64be_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py
Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/bin/travis-ci/conf.qemu_arm64be_na b/bin/travis-ci/conf.qemu_arm64be_na new file mode 100644 index 000000000000..3929636932e6 --- /dev/null +++ b/bin/travis-ci/conf.qemu_arm64be_na @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2024 Jiaxun Yang +#
+console_impl=qemu +qemu_machine="virt" +qemu_helper_script="swtpm" +qemu_binary="qemu-system-aarch64" +qemu_extra_args="-cpu cortex-a57 -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device e1000,netdev=net0 -device virtio-rng-pci -semihosting -chardev socket,id=chrtpm,path=/tmp/tpm/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis-device,tpmdev=tpm0" +qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.bin" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py b/py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py new file mode 100644 index 000000000000..5746b37dbcf5 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_qemu_arm64be_na.py @@ -0,0 +1,10 @@ +import os +import travis_tftp
+env__net_uses_pci = True +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot.bin', 0x40400000) +env__efi_fit_tftp_file = {
- 'addr' : 0x40400000,
- "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'],
+}
2.43.0
On Tue, Jun 11, 2024 at 10:00:23PM +0100, Jiaxun Yang wrote:
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
Reviewed-by: Tom Rini trini@konsulko.com
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com --- bin/travis-ci/conf.qemu-xtensa-dc233c_na | 12 ++++++++++++ .../u_boot_boardenv_qemu_xtensa_dc233c_na.py | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 bin/travis-ci/conf.qemu-xtensa-dc233c_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py
diff --git a/bin/travis-ci/conf.qemu-xtensa-dc233c_na b/bin/travis-ci/conf.qemu-xtensa-dc233c_na new file mode 100644 index 000000000000..fc3b5880e5c1 --- /dev/null +++ b/bin/travis-ci/conf.qemu-xtensa-dc233c_na @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2024 Jiaxun Yang +# + +console_impl=qemu +qemu_machine="virt" +qemu_binary="qemu-system-xtensa" +qemu_extra_args="-cpu dc233c -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-pci,netdev=net0 -device virtio-rng-pci -semihosting" +qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot.elf" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py b/py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py new file mode 100644 index 000000000000..8fdb24b284c7 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py @@ -0,0 +1,6 @@ +import os +import travis_tftp + +env__net_uses_pci = True +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot')
On Tue, 11 Jun 2024 at 15:01, Jiaxun Yang jiaxun.yang@flygoat.com wrote:
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
bin/travis-ci/conf.qemu-xtensa-dc233c_na | 12 ++++++++++++ .../u_boot_boardenv_qemu_xtensa_dc233c_na.py | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 bin/travis-ci/conf.qemu-xtensa-dc233c_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py
Reviewed-by: Simon Glass sjg@chromium.org
It is nice to always add a commit message.
diff --git a/bin/travis-ci/conf.qemu-xtensa-dc233c_na b/bin/travis-ci/conf.qemu-xtensa-dc233c_na new file mode 100644 index 000000000000..fc3b5880e5c1 --- /dev/null +++ b/bin/travis-ci/conf.qemu-xtensa-dc233c_na @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2024 Jiaxun Yang +#
+console_impl=qemu +qemu_machine="virt" +qemu_binary="qemu-system-xtensa" +qemu_extra_args="-cpu dc233c -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-pci,netdev=net0 -device virtio-rng-pci -semihosting" +qemu_kernel_args="-kernel ${U_BOOT_BUILD_DIR}/u-boot.elf" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py b/py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py new file mode 100644 index 000000000000..8fdb24b284c7 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_qemu_xtensa_dc233c_na.py @@ -0,0 +1,6 @@ +import os +import travis_tftp
+env__net_uses_pci = True +env__net_dhcp_server = True
+env__net_tftp_readable_file = travis_tftp.file2env('u-boot')
2.43.0
On Tue, Jun 11, 2024 at 10:00:24PM +0100, Jiaxun Yang wrote:
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
Reviewed-by: Tom Rini trini@konsulko.com
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com --- bin/travis-ci/conf.qemu-loongarch64_na | 12 ++++++++++++ py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 bin/travis-ci/conf.qemu-loongarch64_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py
diff --git a/bin/travis-ci/conf.qemu-loongarch64_na b/bin/travis-ci/conf.qemu-loongarch64_na new file mode 100644 index 000000000000..e8860bb40326 --- /dev/null +++ b/bin/travis-ci/conf.qemu-loongarch64_na @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2024 Jiaxun Yang +# + +console_impl=qemu +qemu_machine="virt" +qemu_binary="qemu-system-loongarch64" +qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-pci,netdev=net0 -device virtio-rng-pci" +qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.bin" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py b/py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py new file mode 100644 index 000000000000..8a9f747f0457 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py @@ -0,0 +1,11 @@ +import os +import travis_tftp + +env__net_uses_pci = True +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot') +env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') +env__efi_loader_grub_file = travis_tftp.file2env('grub_loongarch64.efi') +env__efi_fit_tftp_file = { + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +}
On Tue, 11 Jun 2024 at 15:01, Jiaxun Yang jiaxun.yang@flygoat.com wrote:
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
bin/travis-ci/conf.qemu-loongarch64_na | 12 ++++++++++++ py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 bin/travis-ci/conf.qemu-loongarch64_na create mode 100644 py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py
Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/bin/travis-ci/conf.qemu-loongarch64_na b/bin/travis-ci/conf.qemu-loongarch64_na new file mode 100644 index 000000000000..e8860bb40326 --- /dev/null +++ b/bin/travis-ci/conf.qemu-loongarch64_na @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2024 Jiaxun Yang +#
+console_impl=qemu +qemu_machine="virt" +qemu_binary="qemu-system-loongarch64" +qemu_extra_args="-m 1G -nographic -netdev user,id=net0,tftp=${UBOOT_TRAVIS_BUILD_DIR} -device virtio-net-pci,netdev=net0 -device virtio-rng-pci" +qemu_kernel_args="-bios ${U_BOOT_BUILD_DIR}/u-boot.bin" +reset_impl=none +flash_impl=none diff --git a/py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py b/py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py new file mode 100644 index 000000000000..8a9f747f0457 --- /dev/null +++ b/py/travis-ci/u_boot_boardenv_qemu_loongarch64_na.py @@ -0,0 +1,11 @@ +import os +import travis_tftp
+env__net_uses_pci = True +env__net_dhcp_server = True +env__net_tftp_readable_file = travis_tftp.file2env('u-boot') +env__efi_loader_helloworld_file = travis_tftp.file2env('lib/efi_loader/helloworld.efi') +env__efi_loader_grub_file = travis_tftp.file2env('grub_loongarch64.efi') +env__efi_fit_tftp_file = {
- "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'],
+}
2.43.0
On Tue, Jun 11, 2024 at 10:00:25PM +0100, Jiaxun Yang wrote:
Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com
Reviewed-by: Tom Rini trini@konsulko.com
On Tue, 11 Jun 2024 22:00:21 +0100, Jiaxun Yang wrote:
This series updated u-boot-test-hooks to adopt QEMU 9.0.
It also introduced 3 new boards: qemu-arm64be, qemu-xtensa-dc233c and qemu-loongarch64.
This is required for CI changes.
[...]
Applied, thanks!
[1/4] qemu-vexpress*: Pass -audio none commit: 7eaa30aaa2dcdfd939db662ef517ba8c411301e7 [2/4] qemu-arm64be: New board commit: 7de06ed2d04ad9d771715139f26b45ee6b7cb29c [3/4] qemu-xtensa-dc233c: New board commit: 47b1a21625e3ca75b43661efaabfceb40760587b [4/4] qemu-loongarch64: New board commit: 0648b933e0ca0d7849ca01048a805d7e2aa1e7d1
Best regards,
participants (3)
-
Jiaxun Yang -
Simon Glass -
Tom Rini