Message ID | 20221003160754.6991-2-heinrich.schuchardt@canonical.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
Series | riscv: Fix build against binutils 2.38 | expand |
On Mon, Oct 03, 2022 at 06:07:52PM +0200, Heinrich Schuchardt wrote: > For building riscv32 targets we should use the riscv32 toolchain. > Add it to the Docker image. > > Drop the riscv toolchain-alias as we do not need it in future. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Tom Rini <trini@konsulko.com>
> From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > Sent: Tuesday, October 04, 2022 12:08 AM > To: Tom Rini <trini@konsulko.com> > Cc: Rick Jian-Zhi Chen(陳建志) <rick@andestech.com>; Leo Yu-Chi Liang(梁育齊) <ycliang@andestech.com>; Simon Glass <sjg@chromium.org>; Alexandre Ghiti <alexandre.ghiti@canonical.com>; Aurelien Jarno <aurelien@aurel32.net>; u-boot@lists.denx.de; Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > Subject: [PATCH v4 1/3] docker: install riscv32 toolchain > > For building riscv32 targets we should use the riscv32 toolchain. > Add it to the Docker image. > > Drop the riscv toolchain-alias as we do not need it in future. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > v4: > drop riscv toolchain-alias > v3: > new patch > --- > tools/docker/Dockerfile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Rick Chen <rick@andestech.com>
On Mon, Oct 03, 2022 at 06:07:52PM +0200, Heinrich Schuchardt wrote: > For building riscv32 targets we should use the riscv32 toolchain. > Add it to the Docker image. > > Drop the riscv toolchain-alias as we do not need it in future. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > Reviewed-by: Rick Chen <rick@andestech.com> Applied to u-boot/master, thanks!
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index d3292e752a..cbd837ad4e 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -24,6 +24,7 @@ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0/x86_64-gcc-11.1.0-nolibc-nios2-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0/x86_64-gcc-11.1.0-nolibc-powerpc-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0/x86_64-gcc-11.1.0-nolibc-riscv64-linux.tar.xz | tar -C /opt -xJ +RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0/x86_64-gcc-11.1.0-nolibc-riscv32-linux.tar.xz | tar -C /opt -xJ RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0/x86_64-gcc-11.1.0-nolibc-sh2-linux.tar.xz | tar -C /opt -xJ # Manually install other toolchains @@ -217,6 +218,5 @@ RUN /bin/echo -e "kernelorg = /opt/gcc-11.1.0-nolibc/*" >> ~/.buildman RUN /bin/echo -e "arc = /opt/arc_gnu_2021.03_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman -RUN /bin/echo -e "\nriscv = riscv64" >> ~/.buildman RUN /bin/echo -e "\nsandbox = x86_64" >> ~/.buildman RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman;
For building riscv32 targets we should use the riscv32 toolchain. Add it to the Docker image. Drop the riscv toolchain-alias as we do not need it in future. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- v4: drop riscv toolchain-alias v3: new patch --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)