Skip to content
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

undo sdk move from 15.2 to 16.0 #27015

Merged
merged 1 commit into from
Jun 1, 2023
Merged

undo sdk move from 15.2 to 16.0 #27015

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 scripts/build/builders/nrf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def generate(self):
zephyr_base = os.environ['ZEPHYR_BASE']
nrfconnect_sdk = os.path.dirname(zephyr_base)
zephyr_sdk_dir = os.environ.get('ZEPHYR_SDK_INSTALL_DIR') or os.path.join(
os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.16.0')
os.environ['NRF5_TOOLS_ROOT'], 'zephyr-sdk-0.15.2')

# NRF builds will both try to change .west/config in nrfconnect and
# overall perform a git fetch on that location
Expand Down
2 changes: 1 addition & 1 deletion scripts/examples/nrfconnect_example.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ source "../scripts/activate.sh"
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr

if [[ -z "$ZEPHYR_SDK_INSTALL_DIR" && -n "$NRF5_TOOLS_ROOT" ]]; then
export ZEPHYR_SDK_INSTALL_DIR="$NRF5_TOOLS_ROOT"/zephyr-sdk-0.16.0
export ZEPHYR_SDK_INSTALL_DIR="$NRF5_TOOLS_ROOT"/zephyr-sdk-0.15.2
fi

# Set ccache base directory to improve the cache hit ratio
Expand Down
2 changes: 1 addition & 1 deletion third_party/openthread/ot-nxp
Open in desktop
Submodule ot-nxp updated 8 files
+1 −1 openthread
+0 −1 script/build_jn5189
+0 −1 script/build_k32w061
+0 −1 script/build_rt1060
+0 −9 src/imx_rt/platform/spinel_hdlc.hpp
+10 −0 src/imx_rt/rt1060/openthread-core-rt1060-config.h
+6 −7 src/k32w0/platform/ecdsa-nxp-ultrafast-p256.cpp
+0 −28 src/k32w0/platform/radio.c
2 changes: 1 addition & 1 deletion third_party/pigweed/repo
Open in desktop
Submodule repo updated 79 files
+0 −1 .gitignore
+2 −14 CMakeLists.txt
+0 −2 Kconfig.zephyr
+0 −1 PIGWEED_MODULES
+0 −1 docs/BUILD.gn
+0 −15 docs/os/zephyr.rst
+2 −3 pw_assert_log/Android.bp
+0 −22 pw_base64/Kconfig
+49 −86 pw_bluetooth/public/pw_bluetooth/hci.emb
+14 −22 pw_bluetooth/public/pw_bluetooth/vendor.emb
+0 −4 pw_build/generated_pigweed_modules_lists.gni
+1 −4 pw_build/python.gni
+0 −2 pw_checksum/CMakeLists.txt
+1 −1 pw_env_setup/py/pw_env_setup/cipd_setup/host_tools.json
+1 −2 pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
+7 −4 pw_interrupt/docs.rst
+2 −5 pw_interrupt/public/pw_interrupt/context.h
+0 −20 pw_log_zephyr/CMakeLists.txt
+2 −20 pw_log_zephyr/Kconfig
+0 −56 pw_metric/Android.bp
+0 −77 pw_router/Android.bp
+4 −4 pw_rpc/call.cc
+1 −1 pw_rpc/client_integration_test.cc
+8 −4 pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h
+15 −25 pw_rpc/public/pw_rpc/internal/call.h
+1 −5 pw_rpc/public/pw_rpc/internal/client_call.h
+1 −1 pw_rpc/public/pw_rpc/internal/server_call.h
+1 −1 pw_rpc/public/pw_rpc/writer.h
+2 −0 pw_rpc/pw_rpc_private/fake_server_reader_writer.h
+8 −4 pw_rpc/pwpb/public/pw_rpc/pwpb/server_reader_writer.h
+8 −0 pw_rpc/raw/public/pw_rpc/raw/client_reader_writer.h
+4 −0 pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h
+2 −1 pw_rpc_transport/Android.bp
+0 −41 pw_rpc_transport/BUILD.bazel
+0 −37 pw_rpc_transport/BUILD.gn
+0 −207 pw_rpc_transport/CMakeLists.txt
+0 −156 pw_rpc_transport/docs.rst
+0 −232 pw_rpc_transport/public/pw_rpc_transport/socket_rpc_transport.h
+0 −54 pw_rpc_transport/socket_rpc_transport.cc
+0 −364 pw_rpc_transport/socket_rpc_transport_test.cc
+9 −21 pw_stream/socket_stream.cc
+0 −2 pw_string/Android.bp
+40 −34 pw_string/public/pw_string/internal/string_common_functions.inc
+24 −23 pw_string/public/pw_string/internal/string_impl.h
+103 −68 pw_string/public/pw_string/string.h
+2 −2 pw_string/string_test.cc
+0 −35 pw_sync_zephyr/CMakeLists.txt
+0 −8 pw_sync_zephyr/Kconfig
+0 −41 pw_sync_zephyr/public/pw_sync_zephyr/thread_notification_inline.h
+0 −23 pw_sync_zephyr/public/pw_sync_zephyr/thread_notification_native.h
+0 −28 pw_sync_zephyr/public/pw_sync_zephyr/timed_thread_notification_inline.h
+0 −16 pw_sync_zephyr/public_overrides/thread_notification/pw_sync_backend/thread_notification_inline.h
+0 −16 pw_sync_zephyr/public_overrides/thread_notification/pw_sync_backend/thread_notification_native.h
+0 −16 pw_sync_zephyr/public_overrides/timed_thread_notification/pw_sync_backend/timed_thread_notification_inline.h
+1 −12 pw_system/CMakeLists.txt
+0 −32 pw_system/Kconfig
+0 −3 pw_system/backend.cmake
+2 −2 pw_system/py/pw_system/device.py
+0 −67 pw_system/zephyr_target_hooks.cc
+0 −62 pw_tokenizer/Android.bp
+4 −1 pw_tokenizer/BUILD.gn
+2 −2 pw_tokenizer/CMakeLists.txt
+1 −1 pw_tokenizer/docs.rst
+55 −0 pw_tokenizer/pw_tokenizer_linker_rules.ld
+1 −33 pw_tokenizer/pw_tokenizer_linker_sections.ld
+0 −40 pw_tokenizer/pw_tokenizer_zephyr.ld
+0 −1 pw_transfer/OWNERS
+2 −2 pw_transfer/integration_test/proxy.py
+0 −26 pw_unit_test_zephyr/BUILD.gn
+0 −27 pw_unit_test_zephyr/CMakeLists.txt
+0 −10 pw_unit_test_zephyr/docs.rst
+0 −24 pw_unit_test_zephyr/main.cc
+0 −32 pw_unit_test_zephyr/prj.conf
+0 −23 pw_unit_test_zephyr/testcase.yaml
+1 −5 third_party/fuchsia/copy.bara.sky
+0 −66 third_party/fuchsia/repo/zircon/system/ulib/lazy_init/include/lib/lazy_init/internal/storage.h
+0 −287 third_party/fuchsia/repo/zircon/system/ulib/lazy_init/include/lib/lazy_init/lazy_init.h
+0 −50 third_party/fuchsia/repo/zircon/system/ulib/lazy_init/include/lib/lazy_init/options.h
+0 −6 zephyr/CMakeLists.txt