On Fri, May 1, 2020 at 9:24 PM Bin Meng <bmeng...@gmail.com> wrote:
>
> From: Bin Meng <bin.m...@windriver.com>
>
> This updates the GitLab CI opensbi job to build opensbi bios images
> for the generic platform.
>
> Signed-off-by: Bin Meng <bin.m...@windriver.com>
> ---
>
> .gitlab-ci-opensbi.yml | 26 ++++++++------------------
> 1 file changed, 8 insertions(+), 18 deletions(-)
>
> diff --git a/.gitlab-ci-opensbi.yml b/.gitlab-ci-opensbi.yml
> index dd051c0..26092bb 100644
> --- a/.gitlab-ci-opensbi.yml
> +++ b/.gitlab-ci-opensbi.yml
> @@ -34,18 +34,12 @@ build-opensbi:
> when: always
> artifacts:
> paths: # 'artifacts.zip' will contains the following files:
> - - pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
> - - pc-bios/opensbi-riscv32-virt-fw_jump.bin
> - - pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
> - - pc-bios/opensbi-riscv64-virt-fw_jump.bin
> - - opensbi32-virt-stdout.log
> - - opensbi32-virt-stderr.log
> - - opensbi64-virt-stdout.log
> - - opensbi64-virt-stderr.log
> - - opensbi32-sifive_u-stdout.log
> - - opensbi32-sifive_u-stderr.log
> - - opensbi64-sifive_u-stdout.log
> - - opensbi64-sifive_u-stderr.log
> + - pc-bios/opensbi-riscv32-generic-fw_jump.bin
> + - pc-bios/opensbi-riscv64-generic-fw_jump.bin
Same comment as PATCH1
We should add generic-fw_jump.elf here as well.
> + - opensbi32-generic-stdout.log
> + - opensbi32-generic-stderr.log
> + - opensbi64-generic-stdout.log
> + - opensbi64-generic-stderr.log
> image: $CI_REGISTRY_IMAGE:opensbi-cross-build
> variables:
> GIT_DEPTH: 3
> @@ -54,10 +48,6 @@ build-opensbi:
> - export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
> - echo "=== Using ${JOBS} simultaneous jobs ==="
> - make -j${JOBS} -C roms/opensbi clean
> - - make -j${JOBS} -C roms opensbi32-virt 2>&1 1>opensbi32-virt-stdout.log |
> tee -a opensbi32-virt-stderr.log >&2
> + - make -j${JOBS} -C roms opensbi32-generic 2>&1
> 1>opensbi32-generic-stdout.log | tee -a opensbi32-generic-stderr.log >&2
> - make -j${JOBS} -C roms/opensbi clean
> - - make -j${JOBS} -C roms opensbi64-virt 2>&1 1>opensbi64-virt-stdout.log |
> tee -a opensbi64-virt-stderr.log >&2
> - - make -j${JOBS} -C roms/opensbi clean
> - - make -j${JOBS} -C roms opensbi32-sifive_u 2>&1
> 1>opensbi32-sifive_u-stdout.log | tee -a opensbi32-sifive_u-stderr.log >&2
> - - make -j${JOBS} -C roms/opensbi clean
> - - make -j${JOBS} -C roms opensbi64-sifive_u 2>&1
> 1>opensbi64-sifive_u-stdout.log | tee -a opensbi64-sifive_u-stderr.log >&2
> + - make -j${JOBS} -C roms opensbi64-generic 2>&1
> 1>opensbi64-generic-stdout.log | tee -a opensbi64-generic-stderr.log >&2
> --
> 2.7.4
>
>
Otherwise looks good to me.
Reviewed-by: Anup Patel <a...@brainfault.org>
Regards,
Anup
