andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

ar100: Convert to or1k-elf toolchain

Browse Source 
The more.musl.cc site is blocking downloads from all github actions,
which makes it difficult to use that site for the ar100 cross build
toolchain.  Convert to the openrisc or1k-elf toolchain as a
replacement.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2025-06-08 13:40:18 -04:00
parent 889be5b275
commit 5666b88c69
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ci-build.sh
View File

@ -8,7 +8,7 @@ set -eu
MAIN_DIR=${PWD} MAIN_DIR=${PWD}
BUILD_DIR=${PWD}/ci_build BUILD_DIR=${PWD}/ci_build
export PATH=${BUILD_DIR}/pru-elf/bin:${PATH} export PATH=${BUILD_DIR}/pru-elf/bin:${PATH}
export PATH=${BUILD_DIR}/or1k-linux-musl-cross/bin:${PATH} export PATH=${BUILD_DIR}/or1k-elf/bin:${PATH}
PYTHON=${BUILD_DIR}/python-env/bin/python PYTHON=${BUILD_DIR}/python-env/bin/python
PYTHON2=${BUILD_DIR}/python2-env/bin/python PYTHON2=${BUILD_DIR}/python2-env/bin/python

18
scripts/ci-install.sh
View File

@ -39,20 +39,18 @@ tar xJf ${CACHE_DIR}/${PRU_ARCHIVE}
###################################################################### ######################################################################
# Install or1k-linux-musl toolchain # Install or1k toolchain
###################################################################### ######################################################################
echo -e "\n\n=============== Install or1k-linux-musl toolchain\n\n" echo -e "\n\n=============== Install or1k toolchain\n\n"
TOOLCHAIN=or1k-linux-musl-cross OR1K_ARCHIVE="or1k-elf-12.0.1-20220210-20220304.tar.xz"
TOOLCHAIN_ZIP=${TOOLCHAIN}.tgz OR1K_REL="or1k-12.0.1-20220210-20220304"
GCC_VERSION=10 OR1K_URL="https://github.com/openrisc/or1k-gcc/releases/download/${OR1K_REL}/${OR1K_ARCHIVE}"
TOOLCHAIN_ZIP_V=${TOOLCHAIN}-${GCC_VERSION}.tgz if [ ! -f ${CACHE_DIR}/${OR1K_ARCHIVE} ]; then
URL=https://more.musl.cc/${GCC_VERSION}/x86_64-linux-musl/ wget "${OR1K_URL}" -O "${CACHE_DIR}/${OR1K_ARCHIVE}"
if [ ! -f ${CACHE_DIR}/${TOOLCHAIN_ZIP_V} ]; then
wget "${URL}/${TOOLCHAIN_ZIP}" -O "${CACHE_DIR}/${TOOLCHAIN_ZIP_V}"
fi fi
cd ${BUILD_DIR} cd ${BUILD_DIR}
tar xf ${CACHE_DIR}/${TOOLCHAIN_ZIP_V} tar xJf ${CACHE_DIR}/${OR1K_ARCHIVE}
###################################################################### ######################################################################

2
src/ar100/Makefile
View File

@ -1,4 +1,4 @@
CROSS_PREFIX=or1k-linux-musl- CROSS_PREFIX=or1k-elf-
dirs-y += src/generic src/ar100 lib/ar100 dirs-y += src/generic src/ar100 lib/ar100
CFLAGS += -O3 CFLAGS += -O3