diff options
Diffstat (limited to 'docker/build.sh')
| -rwxr-xr-x | docker/build.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/docker/build.sh b/docker/build.sh index d86e7c2..aab704a 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -12,18 +12,20 @@ export BUILD_DIR="${BUILD_DIR:=$SOURCES_DIR/build}" export OUTPUT_DIR="${OUTPUT_DIR:=$BUILD_DIR/output}" export BUILD_TYPE=${BUILD_TYPE:=Release} -export GCC_ARM_VER=${GCC_ARM_VER:="gcc-arm-none-eabi-9-2020-q2-update"} +export GCC_ARM_VER=${GCC_ARM_VER:="11.2-2022.02"} export NRF_SDK_VER=${NRF_SDK_VER:="nRF5_SDK_15.3.0_59ac345"} MACHINE="$(uname -m)" [[ "$MACHINE" == "arm64" ]] && MACHINE="aarch64" +export GCC_ARM_PATH="gcc-arm-$GCC_ARM_VER-$MACHINE-arm-none-eabi" + main() { local target="$1" mkdir -p "$TOOLS_DIR" - - [[ ! -d "$TOOLS_DIR/$GCC_ARM_VER" ]] && GetGcc + + [[ ! -d "$TOOLS_DIR/$GCC_ARM_PATH" ]] && GetGcc [[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]] && GetNrfSdk [[ ! -d "$TOOLS_DIR/mcuboot" ]] && GetMcuBoot @@ -38,8 +40,7 @@ main() { } GetGcc() { - GCC_SRC="$GCC_ARM_VER-$MACHINE-linux.tar.bz" - wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/$GCC_SRC -O - | tar -xj -C $TOOLS_DIR/ + wget -q https://developer.arm.com/-/media/Files/downloads/gnu/$GCC_ARM_VER/binrel/$GCC_ARM_PATH.tar.xz -O - | tar -xJ -C $TOOLS_DIR/ } GetMcuBoot() { @@ -61,7 +62,7 @@ CmakeGenerate() { cmake -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DUSE_OPENOCD=1 \ - -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_VER" \ + -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_PATH" \ -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \ -DBUILD_DFU=1 \ "$SOURCES_DIR" @@ -76,4 +77,4 @@ CmakeBuild() { fi } -[[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"
\ No newline at end of file +[[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!" |