scripts: Use new toolchains based on crosstool-ng

This switches to toolchains from
antmicro's conda channel.

The new toolchains are built using
`crosstool-ng` and contain both
binutils and the compiler itself.

scripts/build-linux.sh

@@ -44,12 +44,12 @@ if [ "$FIRMWARE" != "linux" ]; then
 fi
 
 # Install a baremetal toolchain with the newlib standard library
-if ! ${CPU_ARCH}-elf-newlib --version > /dev/null 2>&1; then
-	conda install gcc-${CPU_ARCH}-elf-newlib
+if ! ${CPU_ARCH}-elf-newlib-gcc --version > /dev/null 2>&1; then
+	conda install toolchain-${CPU_ARCH}-elf-newlib
 fi
 # Install a Linux userspace toolchain with the musl standard library
 if ! ${CPU_ARCH}-linux-musl-gcc --version > /dev/null 2>&1; then
-	conda install gcc-${CPU_ARCH}-linux-musl
+	conda install toolchain-${CPU_ARCH}-linux-musl
 fi
 
 if [ ${CPU} = mor1kx ]; then

scripts/build-micropython.sh

@@ -40,7 +40,7 @@ fi
 
 # Install a toolchain with the newlib standard library
 if ! ${CPU_ARCH}-elf-newlib-gcc --version > /dev/null 2>&1; then
-	conda install gcc-${CPU_ARCH}-elf-newlib
+	conda install toolchain-${CPU_ARCH}-elf-newlib
 fi
 
 # Get micropython is needed

scripts/build-pack.sh

@@ -61,16 +61,12 @@ echo "  - openocd=$OPENOCD_VERSION" >> $ENV_FILE
 # Some conda packages are not there yet (namely x86_64 and lm32 with musl),
 # so we comment these out.
 for ARCH in or1k riscv32 lm32 x86_64; do
-	if [[ "$ARCH" == "x86_64" ]]; then
-		echo -n "#" >> $ENV_FILE
-	fi
-	echo "  - binutils-$ARCH-elf=$BINUTILS_VERSION" >> $ENV_FILE
 	for FLAVOR in elf-nostdc elf-newlib linux-musl; do
 		if [[ "$ARCH" == "x86_64" || ( "$ARCH" == "lm32"
 									&& "$FLAVOR" == "linux-musl" ) ]]; then
 			echo -n "#" >> $ENV_FILE
 	fi
-	echo "  - gcc-$ARCH-$FLAVOR=$GCC_VERSION" >> $ENV_FILE
+	echo "  - toolchain-$ARCH-$FLAVOR=$GCC_VERSION" >> $ENV_FILE
 	done
 done
 

scripts/download-env.sh

@@ -312,15 +312,9 @@ echo "---------------------------------------"
 
 # binutils for the target
 echo
-echo "Installing binutils for ${CPU_ARCH} (assembler, linker, and other tools)"
-conda install -y $CONDA_FLAGS binutils-${CPU_ARCH}-elf=$BINUTILS_VERSION
-check_version ${CPU_ARCH}-elf-ld $BINUTILS_VERSION
-
-# gcc for the target
-echo
-echo "Installing gcc for ${CPU_ARCH} ('bare metal' C cross compiler)"
-conda install -y $CONDA_FLAGS gcc-${CPU_ARCH}-elf-nostdc=$GCC_VERSION
-check_version ${CPU_ARCH}-elf-gcc $GCC_VERSION
+echo "Installing toolchain for ${CPU_ARCH} (assembler, linker, compiler and other tools)"
+conda install -y $CONDA_FLAGS toolchain-${CPU_ARCH}-elf-nostdc=$TOOLCHAIN_VERSION
+check_version ${CPU_ARCH}-elf-gcc $TOOLCHAIN_VERSION
 
 # gdb for the target
 #echo

scripts/enter-env.sh

@@ -305,17 +305,9 @@ echo ""
 echo "Checking C compiler toolchain"
 echo "---------------------------------------"
 
-# binutils for the target
-
-
-
-check_version ${CPU_ARCH}-elf-ld $BINUTILS_VERSION || return 1
 
 # gcc for the target
-
-
-
-check_version ${CPU_ARCH}-elf-gcc $GCC_VERSION || return 1
+check_version ${CPU_ARCH}-elf-gcc $TOOLCHAIN_VERSION || return 1
 
 # gdb for the target
 #

scripts/settings.sh

@@ -14,8 +14,7 @@ HEXFILE_VERSION=0.1
 CMAKE_VERSION=3.14.4
 
 # Conda package versions
-BINUTILS_VERSION=2.32
-GCC_VERSION=9.1.0
+TOOLCHAIN_VERSION=9.1.0
 SDCC_VERSION=3.5.0
 OPENOCD_VERSION=0.10.0
 

scripts/setup-helpers.sh

@@ -122,6 +122,7 @@ function install_conda {
 	conda update -q conda
 	fix_conda
 	conda config --system --add channels timvideos
+	conda config --system --prepend channels antmicro
 	conda info
 }