Skip to contentSkip to conversation

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

PATCH Superseded Bin Meng 2 participants 5 messages Jul 16, 2020 – Jul 20, 2020 1 message not in the archive

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH v2 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.

---

Changes in v2:
- rebase on u-boot/master

 .azure-pipelines.yml | 8 ++++----
 .gitlab-ci.yml       | 8 ++++----
 .travis.yml          | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
.azure-pipelines.yml +4 -4
index 98e8a4f..7ec4ff9 100644
@@ -299,12 +299,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 d074695..55d39dd 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 1ff1408..96fd55f 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
author
#1 lore raw

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

Hi Rick,

Quoted 10 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.

---

Quoted 8 lines

Changes in v2:
- rebase on u-boot/master

 .azure-pipelines.yml | 8 ++++----
 .gitlab-ci.yml       | 8 ++++----
 .travis.yml          | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

Ping?

Regards,
Bin

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

#3 lore raw

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

Hi Bin

Quoted 22 lines

From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Monday, July 20, 2020 10:41 AM
To: Rick Jian-Zhi Chen(???); U-Boot Mailing List
Cc: Tom Rini; Bin Meng
Subject: Re: [PATCH v2] azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Hi Rick,

Quoted 13 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.

---

Changes in v2:
- rebase on u-boot/master

Quoted 7 lines
Quoted 5 lines
 .azure-pipelines.yml | 8 ++++----
 .gitlab-ci.yml       | 8 ++++----
 .travis.yml          | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

Ping?

It still conflict with u-boot/master.

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

Thanks,
Rick

Quoted 3 lines

Regards,
Bin

author
#4 lore raw

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

Hi Rick,

Quoted 33 lines · Rick Chen

Hi Bin

Quoted 22 lines

From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Monday, July 20, 2020 10:41 AM
To: Rick Jian-Zhi Chen(???); U-Boot Mailing List
Cc: Tom Rini; Bin Meng
Subject: Re: [PATCH v2] azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Hi Rick,

Quoted 13 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.

---

Changes in v2:
- rebase on u-boot/master

Quoted 7 lines
Quoted 5 lines
 .azure-pipelines.yml | 8 ++++----
 .gitlab-ci.yml       | 8 ++++----
 .travis.yml          | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

Ping?

Quoted 8 lines

It still conflict with u-boot/master.

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

I suspect this is because u-boot-riscv/master is a little bit old. Can you rebase u-boot-riscv/master on top of u-boot/master and retry?

Regards,
Bin

#5 lore raw

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

Hi Bin

Quoted 45 lines

Hi Rick,

Quoted 33 lines · Rick Chen

Hi Bin

Quoted 22 lines

From: Bin Meng [mailto:bmeng.cn at gmail.com]
Sent: Monday, July 20, 2020 10:41 AM
To: Rick Jian-Zhi Chen(???); U-Boot Mailing List
Cc: Tom Rini; Bin Meng
Subject: Re: [PATCH v2] azure: gitlab: travis: Update OpenSBI used for RISC-V testing

Hi Rick,

Quoted 13 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.

---

Changes in v2:
- rebase on u-boot/master

Quoted 7 lines
Quoted 5 lines
 .azure-pipelines.yml | 8 ++++----
 .gitlab-ci.yml       | 8 ++++----
 .travis.yml          | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

Ping?

Quoted 8 lines

It still conflict with u-boot/master.

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

Quoted 2 lines

I suspect this is because u-boot-riscv/master is a little bit old. Can you rebase u-boot-riscv/master on top of u-boot/master and retry?

Yes, I have rebased to the latest u-boot/master. But the conflicts still occur

Thanks,
Rick.

Quoted 3 lines

Regards,
Bin