| Message ID | 1594890843-14286-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Andes |
| Headers | show |
| Series | [v2] azure: gitlab: travis: Update OpenSBI used for RISC-V testing | expand |
Hi Rick, On Thu, Jul 16, 2020 at 5:15 PM Bin Meng <bmeng.cn@gmail.com> 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> > --- > > 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
Hi Bin > From: Bin Meng [mailto:bmeng.cn@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, > > On Thu, Jul 16, 2020 at 5:15 PM Bin Meng <bmeng.cn@gmail.com> 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> > > --- > > > > 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? 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 > > Regards, > Bin
Hi Rick, On Mon, Jul 20, 2020 at 11:16 AM Rick Chen <rickchen36@gmail.com> wrote: > > Hi Bin > > > From: Bin Meng [mailto:bmeng.cn@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, > > > > On Thu, Jul 16, 2020 at 5:15 PM Bin Meng <bmeng.cn@gmail.com> 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> > > > --- > > > > > > 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? > > 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
Hi Bin > Hi Rick, > > On Mon, Jul 20, 2020 at 11:16 AM Rick Chen <rickchen36@gmail.com> wrote: > > > > Hi Bin > > > > > From: Bin Meng [mailto:bmeng.cn@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, > > > > > > On Thu, Jul 16, 2020 at 5:15 PM Bin Meng <bmeng.cn@gmail.com> 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> > > > > --- > > > > > > > > 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? > > > > 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? Yes, I have rebased to the latest u-boot/master. But the conflicts still occur Thanks, Rick. > > Regards, > Bin
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 98e8a4f..7ec4ff9 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -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} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d074695..55d39dd 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 1ff1408..96fd55f 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: