Commit bf7801df authored by Max Filippov's avatar Max Filippov Committed by Alex Bennée
Browse files

tests/docker: update toolchain set in debian-xtensa-cross 



Switch to the prebuilt xtensa toolchains release 2020.07.
Drop csp toolchain as the csp core is not a part of QEMU.
Add de233_fpu and dsp3400 toolchains to enable DFPU and FPU2000 tests.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
[AJB: fix path in configure.sh]
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-Id: <20200708082347.27318-1-jcmvbkbc@gmail.com>
Message-Id: <20200709141327.14631-13-alex.bennee@linaro.org>
parent 85c5e699

tests/docker/dockerfiles/debian-xtensa-cross.docker

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ RUN apt-get update && \ 
        git \

        python3-minimal



ENV CPU_LIST csp dc232b dc233c

ENV TOOLCHAIN_RELEASE 2018.02

ENV CPU_LIST dc232b dc233c de233_fpu dsp3400

ENV TOOLCHAIN_RELEASE 2020.07



RUN for cpu in $CPU_LIST; do \

        curl -#SL http://github.com/foss-xtensa/toolchain/releases/download/$TOOLCHAIN_RELEASE/x86_64-$TOOLCHAIN_RELEASE-xtensa-$cpu-elf.tar.gz \

        | tar -xzC /opt; \

    done



ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-csp-elf/bin
 
ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin

tests/tcg/configure.sh

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ for target in $target_list; do 
      container_image=debian-xtensa-cross



      # default to the dc232b cpu

      container_cross_cc=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc

      container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc

      ;;

  esac