diff mbox series

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

Message ID 1593260464-32721-1-git-send-email-bmeng.cn@gmail.com
State Superseded
Delegated to: Andes
Headers show
Series azure: gitlab: travis: Update OpenSBI used for RISC-V testing | expand

Commit Message

Bin Meng June 27, 2020, 12:21 p.m. UTC 
From: Bin Meng <bin.meng@windriver.com>

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

Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
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@gmail.com/

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

Comments

Tom Rini July 7, 2020, 2:12 p.m. UTC | #1 
On Sat, Jun 27, 2020 at 05:21:04AM -0700, Bin Meng wrote:

> From: Bin Meng <bin.meng@windriver.com>
> 
> Change to use OpenSBI release v0.8 generic platform images for QEMU
> RISC-V CI testing for azure, gitlab and travis-ci.
> 
> Signed-off-by: Bin Meng <bin.meng@windriver.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
Rick Chen July 16, 2020, 8:37 a.m. UTC | #2 
Hi Bin

> From: U-Boot [mailto:u-boot-bounces@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:
>
> > From: Bin Meng <bin.meng@windriver.com>
> >
> > Change to use OpenSBI release v0.8 generic platform images for QEMU
> > RISC-V CI testing for azure, gitlab and travis-ci.
> >
> > Signed-off-by: Bin Meng <bin.meng@windriver.com>
>
> Reviewed-by: Tom Rini <trini@konsulko.com>
>

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
Bin Meng July 16, 2020, 8:51 a.m. UTC | #3 
Hi Rick,

On Thu, Jul 16, 2020 at 4:37 PM Rick Chen <rickchen36@gmail.com> wrote:
>
> Hi Bin
>
> > From: U-Boot [mailto:u-boot-bounces@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:
> >
> > > From: Bin Meng <bin.meng@windriver.com>
> > >
> > > Change to use OpenSBI release v0.8 generic platform images for QEMU
> > > RISC-V CI testing for azure, gitlab and travis-ci.
> > >
> > > Signed-off-by: Bin Meng <bin.meng@windriver.com>
> >
> > Reviewed-by: Tom Rini <trini@konsulko.com>
> >
>
> 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 ?
>

Sure, will rebase.

Regards,
Bin
diff mbox series

Patch

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 28387ce..421953c 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -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}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2e491c..d83e72b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/.travis.yml b/.travis.yml
index bb02b6d..a11b972 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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: