The toolchain was downgraded due my mistaken assumption that the new
toolchain is what broke the CI tests. It turns out barebox continued
to work normally, after the container update, but QEMU has moved the
default console away from the single console that barebox knew about.
This has since been worked around by commit b2a21df3b07b ("openrisc:
dts: describe all 4 UARTs"), so let's remove the needless downgrade
of the OpenRISC toolchain and use the same GCC version that we use
for the other architectures.
Fixes: 18a154ce190e ("ci: container: fix CROSS_COMPILE_openrisc to point at correct version")
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
test/Containerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/Containerfile b/test/Containerfile
index 1c4932f56a64..5c49164d33b6 100644
--- a/test/Containerfile
+++ b/test/Containerfile
@@ -56,7 +56,7 @@ RUN korg_crosstool_dl() { wget -nv -O - https://mirrors.edge.kernel.org/pub/tool
korg_crosstool_dl x86_64 ${GCC_VERSION} arm-linux-gnueabi && \
korg_crosstool_dl x86_64 ${GCC_VERSION} aarch64-linux && \
korg_crosstool_dl x86_64 ${GCC_VERSION} mips-linux && \
- korg_crosstool_dl x86_64 13.1.0 or1k-linux && \
+ korg_crosstool_dl x86_64 ${GCC_VERSION} or1k-linux && \
korg_crosstool_dl x86_64 ${GCC_VERSION} powerpc-linux && \
korg_crosstool_dl x86_64 ${GCC_VERSION} riscv64-linux
@@ -83,7 +83,7 @@ RUN cd /tmp && \
ENV CROSS_COMPILE_arm=/opt/gcc-${GCC_VERSION}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
ENV CROSS_COMPILE_arm64=/opt/gcc-${GCC_VERSION}-nolibc/aarch64-linux/bin/aarch64-linux-
ENV CROSS_COMPILE_mips=/opt/gcc-${GCC_VERSION}-nolibc/mips-linux/bin/mips-linux-
-ENV CROSS_COMPILE_openrisc=/opt/gcc-13.1.0-nolibc/or1k-linux/bin/or1k-linux-
+ENV CROSS_COMPILE_openrisc=/opt/gcc-${GCC_VERSION}-nolibc/or1k-linux/bin/or1k-linux-
ENV CROSS_COMPILE_powerpc=/opt/gcc-${GCC_VERSION}-nolibc/powerpc-linux/bin/powerpc-linux-
ENV CROSS_COMPILE_riscv=/opt/gcc-${GCC_VERSION}-nolibc/riscv64-linux/bin/riscv64-linux-
ENV CROSS_COMPILE_kvx=/opt/gcc-kalray-kvx-v5.0.0/bin/kvx-elf-
--
2.39.2
