Skip to content

Fix building issue for nRF52840 and pull in NCS changes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LuDuda wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix building issue for nRF52840 and pull in NCS changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion openthread
Open in desktop
Submodule openthread updated 266 files
2 changes: 1 addition & 1 deletion openthread-1.1
Open in desktop
Submodule openthread-1.1 updated 3720 files
2 changes: 1 addition & 1 deletion ot-br-posix
Open in desktop
Submodule ot-br-posix updated 82 files
+7 −5 Android.mk
+3 −1 CMakeLists.txt
+9 −0 script/_rt_tables
+144 −0 script/reference-device/send_mld_query.py
+4 −1 src/CMakeLists.txt
+6 −13 src/agent/CMakeLists.txt
+0 −13 src/agent/agent_instance.cpp
+7 −24 src/agent/agent_instance.hpp
+1 −1 src/agent/instance_params.hpp
+55 −56 src/agent/main.cpp
+61 −0 src/agent/vendor.hpp
+0 −18 src/backbone_router/backbone_agent.cpp
+2 −19 src/backbone_router/backbone_agent.hpp
+1 −1 src/backbone_router/dua_routing_manager.hpp
+5 −18 src/backbone_router/nd_proxy.hpp
+38 −0 src/border_agent/CMakeLists.txt
+10 −30 src/border_agent/border_agent.cpp
+6 −22 src/border_agent/border_agent.hpp
+3 −0 src/common/CMakeLists.txt
+13 −13 src/common/code_utils.hpp
+2 −2 src/common/dns_utils.hpp
+31 −31 src/common/logging.hpp
+43 −0 src/common/mainloop.cpp
+5 −3 src/common/mainloop.hpp
+60 −0 src/common/mainloop_manager.cpp
+107 −0 src/common/mainloop_manager.hpp
+5 −18 src/common/task_runner.hpp
+39 −3 src/common/tlv.hpp
+9 −9 src/common/types.hpp
+1 −0 src/dbus/client/client_error.cpp
+6 −0 src/dbus/client/thread_api_dbus.cpp
+215 −196 src/dbus/client/thread_api_dbus.hpp
+1 −0 src/dbus/common/constants.hpp
+20 −20 src/dbus/common/dbus_message_helper.hpp
+5 −0 src/dbus/common/error.hpp
+3 −3 src/dbus/server/dbus_agent.cpp
+4 −18 src/dbus/server/dbus_agent.hpp
+19 −19 src/dbus/server/dbus_object.hpp
+6 −6 src/dbus/server/dbus_request.hpp
+21 −0 src/dbus/server/dbus_thread_object.cpp
+5 −10 src/dbus/server/dbus_thread_object.hpp
+1 −0 src/dbus/server/error_helper.cpp
+8 −0 src/dbus/server/introspect.xml
+16 −31 src/mdns/mdns.cpp
+89 −113 src/mdns/mdns.hpp
+79 −158 src/mdns/mdns_avahi.cpp
+42 −204 src/mdns/mdns_avahi.hpp
+94 −121 src/mdns/mdns_mdnssd.cpp
+44 −183 src/mdns/mdns_mdnssd.hpp
+36 −0 src/ncp/CMakeLists.txt
+1 −5 src/ncp/ncp_openthread.cpp
+20 −25 src/ncp/ncp_openthread.hpp
+38 −40 src/openwrt/ubus/otubus.cpp
+354 −318 src/openwrt/ubus/otubus.hpp
+8 −19 src/rest/connection.hpp
+32 −32 src/rest/json.hpp
+3 −3 src/rest/parser.hpp
+6 −6 src/rest/request.hpp
+9 −9 src/rest/resource.hpp
+7 −7 src/rest/response.hpp
+2 −23 src/rest/rest_web_server.cpp
+3 −19 src/rest/rest_web_server.hpp
+39 −0 src/sdp_proxy/CMakeLists.txt
+33 −21 src/sdp_proxy/advertising_proxy.cpp
+20 −13 src/sdp_proxy/advertising_proxy.hpp
+1 −1 src/sdp_proxy/discovery_proxy.cpp
+1 −1 src/sdp_proxy/discovery_proxy.hpp
+3 −1 src/utils/CMakeLists.txt
+3 −3 src/utils/crc16.hpp
+3 −3 src/utils/pskc.hpp
+6 −7 src/utils/socket_utils.hpp
+5 −5 src/utils/steering_data.hpp
+147 −13 src/utils/thread_helper.cpp
+38 −26 src/utils/thread_helper.hpp
+9 −9 src/web/web-service/ot_client.hpp
+3 −3 src/web/web-service/web_server.hpp
+8 −8 src/web/web-service/wpan_service.hpp
+1 −1 tests/dbus/CMakeLists.txt
+35 −0 tests/dbus/test-client
+45 −44 tests/mdns/main.cpp
+2 −2 tests/scripts/check-android-build
+1 −1 third_party/openthread/repo
2 changes: 1 addition & 1 deletion ot-commissioner
Open in desktop
Submodule ot-commissioner updated 103 files
2 changes: 1 addition & 1 deletion ot-efr32
Open in desktop
Submodule ot-efr32 updated 13 files
+1 −1 .github/workflows/build.yml
+5 −5 examples/sleepy-demo/README.md
+63 −48 examples/sleepy-demo/sleepy-demo-ftd/main.c
+98 −64 examples/sleepy-demo/sleepy-demo-mtd/main.c
+1 −1 openthread
+2 −3 script/efr32-definitions
+0 −1 src/efr32mg1/crypto/mbedtls_config_autogen.h
+0 −1 src/efr32mg12/crypto/mbedtls_config_autogen.h
+0 −1 src/efr32mg13/crypto/mbedtls_config_autogen.h
+0 −1 src/efr32mg21/crypto/mbedtls_config_autogen.h
+2 −2 src/src/openthread-core-efr32-config-check.h
+13 −10 src/src/openthread-core-efr32-config.h
+14 −45 src/src/radio.c
2 changes: 1 addition & 1 deletion ot-nrf528xx
Open in desktop
Submodule ot-nrf528xx updated 28 files
+1 −1 .github/workflows/build.yml
+48 −0 .gitignore
+1 −1 openthread
+2 −2 src/nrf52811/README.md
+4 −0 src/nrf52811/nrf52811.cmake
+13 −3 src/nrf52811/openthread-core-nrf52811-config.h
+2 −2 src/nrf52833/README.md
+4 −0 src/nrf52833/nrf52833.cmake
+13 −3 src/nrf52833/openthread-core-nrf52833-config.h
+2 −2 src/nrf52840/README.md
+4 −0 src/nrf52840/nrf52840.cmake
+13 −3 src/nrf52840/openthread-core-nrf52840-config.h
+38 −36 src/src/radio.c
+12 −9 src/src/transport/uart.c
+4 −0 third_party/NordicSemiconductor/drivers/radio/nrf_802154_config.h
+4 −0 third_party/NordicSemiconductor/drivers/radio/rsch/raal/nrf_raal_config.h
+3,780 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto.h
+823 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_accel_driver.h
+196 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_compat.h
+54 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_driver_common.h
+108 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_entropy_driver.h
+656 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_extra.h
+102 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_platform.h
+1,392 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_se_driver.h
+662 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_sizes.h
+473 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_struct.h
+386 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_types.h
+1,783 −0 third_party/NordicSemiconductor/libraries/nrf_security/include/psa/crypto_values.h
2 changes: 1 addition & 1 deletion script/bootstrap.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ IMAGE_NAME=$(basename "${IMAGE_URL}" .zip)
IMAGE_FILE="$IMAGE_NAME".img
[ -f "$TOOLS_HOME"/images/"$IMAGE_FILE" ] || {
# unit MB
EXPAND_SIZE=2048
EXPAND_SIZE=4096

[ -d "$TOOLS_HOME"/images ] || mkdir -p "$TOOLS_HOME"/images

Expand Down
4 changes: 1 addition & 3 deletions script/make-firmware.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,7 @@ build_ot()
done

# Clean up
rm -rf openthread
git clean -xfd
git submodule update --force
;;

# Build OpenThread 1.1
Expand Down Expand Up @@ -304,7 +302,7 @@ deploy_ncs()
mkdir -p ${script_dir}/../ncs
cd ${script_dir}/../ncs
unset ZEPHYR_BASE
west init -m https://github.com/nrfconnect/sdk-nrf --mr master || true
west init -m https://github.com/nrfconnect/sdk-nrf --mr main || true
cd nrf
git fetch origin
git reset --hard "$commit_hash" || die "ERROR: unable to checkout the specified sdk-nrf commit."
Expand Down
26 changes: 23 additions & 3 deletions script/make-thci.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,34 @@ echo "OUTPUT_ROOT=${OUTPUT_ROOT?}"

mkdir -p "$OUTPUT_ROOT"/ot-comm

# Args:
# - $1 - src_path: Source path of the THCI file
# - $2 - out_name: Name of the output file
ncs_adapt()
{
echo ${1}
local src_path=${1}
local out_path="$OUTPUT_ROOT"/${2}

cp ${src_path} ${out_path}
sed -i 's/Device : OpenThread/Device : OTNCS/g' ${out_path}
sed -i 's/Class : OpenThread/Class : OTNCS/g' ${out_path}
sed -i 's/class OpenThread(/class OTNCS(/g' ${out_path}
sed -i 's/class OpenThread_/class OTNCS_/g' ${out_path}
sed -i 's/THCI.OpenThread/THCI.OTNCS/g' ${out_path}
sed -i 's/super(OpenThread/super(OTNCS/g' ${out_path}
}

src_dir=openthread/tools/harness-thci
(
cp ot-br-posix/third_party/openthread/repo/tools/harness-thci/OpenThread_BR.py "$OUTPUT_ROOT"
case "${REFERENCE_PLATFORM}" in
nrf*)
cp ot-br-posix/third_party/openthread/repo/tools/harness-thci/OpenThread.py "$OUTPUT_ROOT"
cp ${src_dir}/OpenThread_BR.py "$OUTPUT_ROOT"
cp ${src_dir}/OpenThread.py "$OUTPUT_ROOT"
;;
ncs*)
cp thci/*.py "$OUTPUT_ROOT"
ncs_adapt ${src_dir}/OpenThread.py OTNCS.py
ncs_adapt ${src_dir}/OpenThread_BR.py OTNCS_BR.py
;;
esac
)
Expand Down
1 change: 1 addition & 0 deletions script/otbr-setup.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ fi
# nRF Connect SDK related actions
if [ "${REFERENCE_PLATFORM?}" = "ncs" ]; then
apt-get install -y --no-install-recommends vim wiringpi
pip install wrapt==1.12.1
pip install nrfutil

# add calling of link_dongle.py script at startup to update symlink to the dongle
Expand Down