Skip to contentSkip to conversation

azure: gitlab: travis: Update OpenSBI used for RISC-V testing

PATCH New Bin Meng 3 participants 4 messages Jun 27, 2020 – Jul 16, 2020 1 message not in the archive

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/1 azure: gitlab: travis: Update OpenSBI used for RISC-V testing

From: Bin Meng <[email protected]>

Change to use OpenSBI release v0.8 generic platform images for QEMU RISC-V CI testing for azure, gitlab and travis-ci.

---
Depends on the following 2 patches:
- "fdtdec: Honor #address-cells and #size-cells in fdtdec_add_reserved_memory()"
which is currently in the u-boot/next tree
- "test/py: test_efi_fit: Update #size-cells to 1"
http://patchwork.ozlabs.org/project/uboot/patch/1593259920-32256-1-git-send-email-bmeng.cn at gmail.com/

 .azure-pipelines.yml | 8 ++++----
 .gitlab-ci.yml       | 8 ++++----
 .travis.yml          | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
.azure-pipelines.yml +4 -4
index 28387ce..421953c 100644
@@ -283,12 +283,12 @@ jobs:
           cp /opt/grub/grubaa64.efi ~/grub_arm64.efi
           cp /opt/grub/grubarm.efi ~/grub_arm.efi
           if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]]; then
-              wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv32-bin.tar.xz | tar -C /tmp -xJ;
-              export OPENSBI=/tmp/opensbi-0.6-rv32-bin/platform/qemu/virt/firmware/fw_dynamic.bin;
+              wget -O - https://github.com/riscv/opensbi/releases/download/v0.8/opensbi-0.8-rv-bin.tar.xz | tar -C /tmp -xJ;
+              export OPENSBI=/tmp/opensbi-0.8-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
           fi
           if [[ "${TEST_PY_BD}" == "qemu-riscv64_spl" ]]; then
-              wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv64-bin.tar.xz | tar -C /tmp -xJ;
-              export OPENSBI=/tmp/opensbi-0.6-rv64-bin/platform/qemu/virt/firmware/fw_dynamic.bin;
+              wget -O - https://github.com/riscv/opensbi/releases/download/v0.8/opensbi-0.8-rv-bin.tar.xz | tar -C /tmp -xJ;
+              export OPENSBI=/tmp/opensbi-0.8-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
           fi
           # the below corresponds to .gitlab-ci.yml "script"
           cd ${WORK_DIR}
.gitlab-ci.yml +4 -4
index f2e491c..d83e72b 100644
@@ -25,12 +25,12 @@ stages:
     - cp /opt/grub/grubaa64.efi ~/grub_arm64.efi
     - cp /opt/grub/grubarm.efi ~/grub_arm.efi
     - if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]]; then
-        wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv32-bin.tar.xz | tar -C /tmp -xJ;
-        export OPENSBI=/tmp/opensbi-0.6-rv32-bin/platform/qemu/virt/firmware/fw_dynamic.bin;
+        wget -O - https://github.com/riscv/opensbi/releases/download/v0.8/opensbi-0.8-rv-bin.tar.xz | tar -C /tmp -xJ;
+        export OPENSBI=/tmp/opensbi-0.8-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
       fi
     - if [[ "${TEST_PY_BD}" == "qemu-riscv64_spl" ]]; then
-        wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv64-bin.tar.xz | tar -C /tmp -xJ;
-        export OPENSBI=/tmp/opensbi-0.6-rv64-bin/platform/qemu/virt/firmware/fw_dynamic.bin;
+        wget -O - https://github.com/riscv/opensbi/releases/download/v0.8/opensbi-0.8-rv-bin.tar.xz | tar -C /tmp -xJ;
+        export OPENSBI=/tmp/opensbi-0.8-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
       fi
 
   after_script:
.travis.yml +4 -4
index bb02b6d..a11b972 100644
@@ -204,12 +204,12 @@ before_script:
        popd;
     fi
   - if [[ "${TEST_PY_BD}" == "qemu-riscv32_spl" ]]; then
-       wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv32-bin.tar.xz | tar -C /tmp -xJ;
-       export OPENSBI=/tmp/opensbi-0.6-rv32-bin/platform/qemu/virt/firmware/fw_dynamic.bin;
+       wget -O - https://github.com/riscv/opensbi/releases/download/v0.8/opensbi-0.8-rv-bin.tar.xz | tar -C /tmp -xJ;
+       export OPENSBI=/tmp/opensbi-0.8-rv-bin/share/opensbi/ilp32/generic/firmware/fw_dynamic.bin;
     fi
   - if [[ "${TEST_PY_BD}" == "qemu-riscv64_spl" ]]; then
-       wget -O - https://github.com/riscv/opensbi/releases/download/v0.6/opensbi-0.6-rv64-bin.tar.xz | tar -C /tmp -xJ;
-       export OPENSBI=/tmp/opensbi-0.6-rv64-bin/platform/qemu/virt/firmware/fw_dynamic.bin;
+       wget -O - https://github.com/riscv/opensbi/releases/download/v0.8/opensbi-0.8-rv-bin.tar.xz | tar -C /tmp -xJ;
+       export OPENSBI=/tmp/opensbi-0.8-rv-bin/share/opensbi/lp64/generic/firmware/fw_dynamic.bin;
     fi
 
 script:
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Quoted 6 lines · Bin Meng

From: Bin Meng <[email protected]>

Change to use OpenSBI release v0.8 generic platform images for QEMU RISC-V CI testing for azure, gitlab and travis-ci.

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/20200707/34eb15da/attachment.sig>

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

PATCH 1/1 azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Hi Bin

Quoted 8 lines

From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Tom Rini
Sent: Tuesday, July 07, 2020 10:13 PM
To: Bin Meng
Cc: U-Boot Mailing List; Bin Meng
Subject: Re: [PATCH] azure: gitlab: travis: Update OpenSBI used for RISC-V testing

On Sat, Jun 27, 2020 at 05:21:04AM -0700, Bin Meng wrote:

Quoted 9 lines
Quoted 6 lines

From: Bin Meng <[email protected]>

Change to use OpenSBI release v0.8 generic platform images for QEMU RISC-V CI testing for azure, gitlab and travis-ci.

I am trying to apply this patch, but it fail

Applying: azure: gitlab: travis: Update OpenSBI used for RISC-V testing
error: patch failed: .azure-pipelines.yml:283
error: .azure-pipelines.yml: patch does not apply
error: patch failed: .gitlab-ci.yml:25
error: .gitlab-ci.yml: patch does not apply
Patch failed at 0001 azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Can you rebase again ?

Thanks,
Rick

author
#4 lore raw

PATCH 1/1 azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Hi Rick,

Quoted 31 lines · Rick Chen

Hi Bin

Quoted 8 lines

From: U-Boot [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Tom Rini
Sent: Tuesday, July 07, 2020 10:13 PM
To: Bin Meng
Cc: U-Boot Mailing List; Bin Meng
Subject: Re: [PATCH] azure: gitlab: travis: Update OpenSBI used for RISC-V testing

On Sat, Jun 27, 2020 at 05:21:04AM -0700, Bin Meng wrote:

Quoted 9 lines
Quoted 6 lines

From: Bin Meng <[email protected]>

Change to use OpenSBI release v0.8 generic platform images for QEMU RISC-V CI testing for azure, gitlab and travis-ci.

I am trying to apply this patch, but it fail

Applying: azure: gitlab: travis: Update OpenSBI used for RISC-V testing
error: patch failed: .azure-pipelines.yml:283
error: .azure-pipelines.yml: patch does not apply
error: patch failed: .gitlab-ci.yml:25
error: .gitlab-ci.yml: patch does not apply
Patch failed at 0001 azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Quoted 2 lines

Can you rebase again ?

Sure, will rebase.

Regards,
Bin