Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ jobs:
wget --tries 4 --no-check-certificate --quiet https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -O gcc-arm.tar.bz2
tar xjf gcc-arm.tar.bz2
echo "PATH=/tmp/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH" >> "$GITHUB_ENV"
wget --tries 4 --no-check-certificate --quiet https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz -O gcc-arm
tar xf gcc-arm
- name: Checkout
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
Expand All @@ -61,9 +59,6 @@ jobs:
REFERENCE_PLATFORM=nrf52840 REFERENCE_RELEASE_TYPE=1.3 ./script/make-reference-release.bash
- name: Build ncs reference release for 1.4
run: |
git submodule status
export ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
export GNUARMEMB_TOOLCHAIN_PATH=/tmp/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi/
REFERENCE_PLATFORM=ncs REFERENCE_RELEASE_TYPE=1.4 ./script/make-reference-release.bash
- uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion config/ncs/overlay-ot-cli-ftd-common.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ CONFIG_LOG_MODE_DEFERRED=y
CONFIG_BOOT_BANNER=n
CONFIG_NET_LOG=n
CONFIG_NET_STATISTICS=n
CONFIG_OPENTHREAD=y
Comment thread
LuDuda marked this conversation as resolved.
CONFIG_OPENTHREAD_DEBUG=n
CONFIG_OPENTHREAD_L2_DEBUG=y

# Shell configuration for harness
CONFIG_SHELL_PROMPT_UART=""
Expand Down
2 changes: 1 addition & 1 deletion config/ncs/sdk-nrf-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aeda4cd8b5735c196b2042a1bd31f0e21359ad0b
v3.1.0
1 change: 1 addition & 0 deletions config/ncs/toolchain-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v3.1.0
18 changes: 5 additions & 13 deletions script/make-firmware.bash
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ nrfutil_setup()
fi

$NRFUTIL install nrf5sdk-tools
$NRFUTIL install sdk-manager
$NRFUTIL install toolchain-manager
$NRFUTIL toolchain-manager install --ncs-version $(<"${script_dir}"'/../config/ncs/toolchain-version')

# Generate private key
if [ ! -f /tmp/private.pem ]; then
Expand All @@ -281,10 +284,6 @@ deploy_ncs()
local commit_hash
commit_hash=$(<"${script_dir}"'/../config/ncs/sdk-nrf-commit')

sudo apt install --no-install-recommends git cmake ninja-build gperf \
ccache dfu-util device-tree-compiler wget \
python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \
make gcc gcc-multilib g++-multilib libsdl2-dev
pip3 install --user west
Comment thread
LuDuda marked this conversation as resolved.
mkdir -p "${script_dir}"/../ncs
cd "${script_dir}"/../ncs
Expand All @@ -308,14 +307,6 @@ deploy_ncs()
git checkout FETCH_HEAD || die "ERROR: unable to checkout the specified openthread commit."
cd ../../../
fi

pip3 install --user -r zephyr/scripts/requirements.txt
pip3 install --user -r nrf/scripts/requirements.txt
pip3 install --user -r bootloader/mcuboot/scripts/requirements.txt

# shellcheck disable=SC1091
source zephyr/zephyr-env.sh
west config manifest.path nrf
}

build_ncs()
Expand Down Expand Up @@ -349,7 +340,8 @@ build_ncs()
local build_path="/tmp/ncs_${app}_${thread_version}"
local hex_path="${build_path}/${sample_name}/zephyr/zephyr.hex"

west build -d "${build_path}" -b nrf52840dongle/nrf52840 -p always "${sample_path}" --sysbuild -- -DOVERLAY_CONFIG="${sample_config}"
$NRFUTIL sdk-manager toolchain launch --ncs-version $(<"${script_dir}"'/../config/ncs/toolchain-version') -- \
west build -d "${build_path}" -b nrf52840dongle/nrf52840 -p always "${sample_path}" --sysbuild -- -DOVERLAY_CONFIG="${sample_config}"

distribute "${hex_path}" "${app}" "${thread_version}" "${timestamp}" "${commit_id}"
done
Expand Down