Skip to contentSkip to conversation

travis-ci: Add EFI grub2 and fit image configuration for qemu-riscv64

PATCH New Bin Meng 2 participants 4 messages Mar 26, 2020 RISC-V

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/3 travis-ci: Add EFI grub2 and fit image configuration for qemu-riscv64

This adds EFI grub2 and fit image configuration for qemu-riscv64 target used for test.

---

 py/travis-ci/u_boot_boardenv_qemu_riscv64_na.py | 5 +++++
 1 file changed, 5 insertions(+)
py/travis-ci/u_boot_boardenv_qemu_riscv64_na.py +5 -0
index 9ad819c..a86e0bd 100644
@@ -1,5 +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'],
+}
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/3 travis-ci: Add qemu-riscv32 target

Add support for testing qemu-riscv32_defconfig.

---

 bin/travis-ci/conf.qemu-riscv32_na              | 11 +++++++++++
 py/travis-ci/u_boot_boardenv_qemu_riscv32_na.py | 10 ++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 bin/travis-ci/conf.qemu-riscv32_na
 create mode 100644 py/travis-ci/u_boot_boardenv_qemu_riscv32_na.py
bin/travis-ci/conf.qemu-riscv32_na new file +11 -0
new file mode 100644
index 0000000..3eb9880
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2020 Bin Meng <[email protected]>
+
+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"
+reset_impl=none
+flash_impl=none
py/travis-ci/u_boot_boardenv_qemu_riscv32_na.py new file +10 -0
new file mode 100644
index 0000000..ba6c122
@@ -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'],
+}
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 3/3 travis-ci: Add qemu-riscv{32,64}_spl targets

In reply to Bin Meng

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.

---

 bin/travis-ci/conf.qemu-riscv32_spl_na              | 11 +++++++++++
 bin/travis-ci/conf.qemu-riscv64_spl_na              | 11 +++++++++++
 py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py | 10 ++++++++++
 py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py | 10 ++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 bin/travis-ci/conf.qemu-riscv32_spl_na
 create mode 100644 bin/travis-ci/conf.qemu-riscv64_spl_na
 create mode 100644 py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py
 create mode 100644 py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py
bin/travis-ci/conf.qemu-riscv32_spl_na new file +11 -0
new file mode 100644
index 0000000..9a76a54
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2020 Bin Meng <[email protected]>
+
+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
bin/travis-ci/conf.qemu-riscv64_spl_na new file +11 -0
new file mode 100644
index 0000000..c0b961c
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright (c) 2020 Bin Meng <[email protected]>
+
+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
py/travis-ci/u_boot_boardenv_qemu_riscv32_spl_na.py new file +10 -0
new file mode 100644
index 0000000..ba6c122
@@ -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'],
+}
py/travis-ci/u_boot_boardenv_qemu_riscv64_spl_na.py new file +10 -0
new file mode 100644
index 0000000..a86e0bd
@@ -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'],
+}
Signature · 1 line
2.7.4
#3 lore raw

PATCH 1/3 travis-ci: Add EFI grub2 and fit image configuration for qemu-riscv64

In reply to Bin Meng
Quoted 2 lines · Bin Meng

This adds EFI grub2 and fit image configuration for qemu-riscv64 target used for test.

I've applied the series.