From 8662c482ce5b38dd7978d43dc7fcc305e4aad73e Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Thu, 1 Aug 2019 09:33:22 +1000
Subject: [PATCH] scripts: Use Linux MUSL toolchain for building Linux Kernel.

These packages are now available via conda since;
 * https://github.com/litex-hub/litex-conda/pull/75
 * https://github.com/litex-hub/litex-conda/pull/80
---
 scripts/build-linux.sh | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
index 5215fcc9d..1af0fc8ba 100755
--- a/scripts/build-linux.sh
+++ b/scripts/build-linux.sh
@@ -44,8 +44,8 @@ if [ "$FIRMWARE" != "linux" ]; then
 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
+if ! ${CPU_ARCH}-linux-musl-gcc --version > /dev/null 2>&1; then
+	conda install gcc-${CPU_ARCH}-linux-musl
 fi
 
 if [ ${CPU} = mor1kx ]; then
@@ -169,7 +169,7 @@ if [ ${CPU} = vexriscv ]; then
 		# offsets are hardcoded in BIOS
 		export CFLAGS="-DDTB=$((RAM_BASE_ADDRESS + 0x01000000)) -Wl,--defsym,__ram_origin=$EMULATOR_RAM_BASE_ADDRESS"
 		export LITEX_BASE="$TOP_DIR/$TARGET_BUILD_DIR"
-		export RISCV_BIN="${CPU_ARCH}-elf-newlib-"
+		export RISCV_BIN="${CPU_ARCH}-elf-"
 		make clean
 		make litex
 
@@ -180,23 +180,7 @@ if [ ${CPU} = vexriscv ]; then
 fi
 
 # Build linux-litex
-
-# download and use pre-built RISC-V compiler (TODO: to be removed later)
-TOOLCHAIN_LOCATION=$TOP_DIR/third_party/riscv-toolchain
-mkdir -p $TOOLCHAIN_LOCATION
-(
-	cd $TOOLCHAIN_LOCATION
-	if [ ! -d riscv ]; then
-		wget https://antmicro.com/projects/renode/litex-buildenv/riscv32-unknown-linux-gnu.tar.gz
-		tar -xf riscv32-unknown-linux-gnu.tar.gz
-	fi
-)
-export PATH=$TOOLCHAIN_LOCATION/riscv/bin:$PATH
-if [ ${CPU} = mor1kx ]; then
-	export CROSS_COMPILE=${CPU_ARCH}-elf-newlib-
-else
-	export CROSS_COMPILE=riscv32-unknown-linux-gnu-
-fi
+export CROSS_COMPILE=${CPU_ARCH}-linux-musl-
 
 TARGET_LINUX_BUILD_DIR=$(dirname $TOP_DIR/$FIRMWARE_FILEBASE)
 (