From 502e5f9dcc4932c2f7fd537711132d3db1b93f65 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 26 Mar 2020 09:05:09 -0700 Subject: [PATCH] hooks: travis-ci: Add qemu-riscv{32,64}_spl targets Add support for testing qemu-riscv{32,64}_spl_defconfig. Unlike qemu-riscv{32,64} targets, this creates a 4-core SMP configuration to cover U-Boot SMP codes testing. Signed-off-by: Bin Meng Signed-off-by: Stephen Warren --- test/hooks/bin/travis-ci/conf.qemu-riscv32_spl_na | 11 +++++++++++ test/hooks/bin/travis-ci/conf.qemu-riscv64_spl_na | 11 +++++++++++ .../travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py | 10 ++++++++++ .../travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py | 10 ++++++++++ 4 files changed, 42 insertions(+) create mode 100644 test/hooks/bin/travis-ci/conf.qemu-riscv32_spl_na create mode 100644 test/hooks/bin/travis-ci/conf.qemu-riscv64_spl_na create mode 100644 test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py create mode 100644 test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py diff --git a/test/hooks/bin/travis-ci/conf.qemu-riscv32_spl_na b/test/hooks/bin/travis-ci/conf.qemu-riscv32_spl_na new file mode 100644 index 00000000000..9a76a54d604 --- /dev/null +++ b/test/hooks/bin/travis-ci/conf.qemu-riscv32_spl_na @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2020 Bin Meng + +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" +reset_impl=none +flash_impl=none diff --git a/test/hooks/bin/travis-ci/conf.qemu-riscv64_spl_na b/test/hooks/bin/travis-ci/conf.qemu-riscv64_spl_na new file mode 100644 index 00000000000..c0b961c596e --- /dev/null +++ b/test/hooks/bin/travis-ci/conf.qemu-riscv64_spl_na @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +# +# Copyright (c) 2020 Bin Meng + +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" +reset_impl=none +flash_impl=none diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py new file mode 100644 index 00000000000..ba6c12249a7 --- /dev/null +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py @@ -0,0 +1,10 @@ +import os +import travis_tftp + +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_riscv32.efi') +env__efi_fit_tftp_file = { + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +} diff --git a/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py new file mode 100644 index 00000000000..a86e0bd42a6 --- /dev/null +++ b/test/hooks/py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py @@ -0,0 +1,10 @@ +import os +import travis_tftp + +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_riscv64.efi') +env__efi_fit_tftp_file = { + "dn" : os.environ['UBOOT_TRAVIS_BUILD_DIR'], +}