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.

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

Upmerge 16.05.2024 #563

Merged
merged 6 commits into from
May 28, 2024
Merged

Conversation

RobertGalatNordic
Copy link
Collaborator

@RobertGalatNordic RobertGalatNordic commented May 21, 2024

new SMF api has more arguments.

CI parameters

Github_actions:
  #(branch, hash, pull/XXX/head)
  NRF_revision: pull/15351/head

  # Do not change after creating PR
  Create_NRF_PR: false
Jenkins:
  test-sdk-sidewalk: sdk-nrf-pr-15351

Description

nrfconnect/sdk-nrf#15351

Self review

  • There is no commented code.
  • There are no TODO/FIXME comments without associated issue ticket.
  • Commits are properly organized.
  • Change has been tested.
  • Tests were updated (if applicable).

@github-actions github-actions bot added the source PR changing src files label May 21, 2024
@ktaborowski ktaborowski changed the title sample: smf_api align with api change Upmerge 16.05.2024 May 22, 2024
remove revision from twister target

Signed-off-by: Robert Gałat <[email protected]>
new SMF api has more arguments.

Signed-off-by: Robert Gałat <[email protected]>
The config that controlled the bootbanner has been changed.
We want to disable it entirely to save space, default is enabled.

Signed-off-by: Robert Gałat <[email protected]>
use the same macro as DFU sample from zephyr.

Signed-off-by: Robert Gałat <[email protected]>
Copy link

github-actions bot commented May 23, 2024

Sample diff used total
[email protected]/nrf54l15/cpuapp:sample.sidewalk.dut RAM -136.38 KB 0 B 256 KB
ROM -494.1 KB 0 B 730 KB
[email protected]/nrf54l15/cpuapp:sample.sidewalk.hello RAM -23.8 KB 0 B 256 KB
ROM -25.79 KB 0 B 48 KB
[email protected]/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only RAM -23.8 KB 0 B 256 KB
ROM -25.79 KB 0 B 48 KB
[email protected]/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only.release RAM -23.8 KB 0 B 256 KB
ROM -25.79 KB 0 B 48 KB
[email protected]/nrf54l15/cpuapp:sample.sidewalk.hello.release RAM -23.8 KB 0 B 256 KB
ROM -25.79 KB 0 B 48 KB
thingy53/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 136 B 38.03 KB 64 KB
ROM 740 B 140.79 KB 222 KB
nrf52840dk/nrf52840:sample.sidewalk.demo RAM 102.04 KB 120.04 KB 256 KB
ROM 470.72 KB 496.83 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.demo.ble_only RAM 86.66 KB 104.66 KB 256 KB
ROM 388.48 KB 414.59 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.dut RAM 276 B 143.54 KB 256 KB
ROM 856 B 555.52 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.hello RAM 91.91 KB 109.91 KB 256 KB
ROM 470.34 KB 496.44 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.hello.ble_only RAM 0 B 18 KB 256 KB
ROM 236 B 26.33 KB 28 KB
nrf52840dk/nrf52840:sample.sidewalk.hello.ble_only.release RAM -71.39 KB 18 KB 256 KB
ROM -325.68 KB 26.33 KB 28 KB
nrf52840dk/nrf52840:sample.sidewalk.hello.release RAM 148 B 105.04 KB 256 KB
ROM 384 B 430.7 KB 983.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.dut RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only.release RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.release RAM 136 B 37.85 KB 64 KB
ROM 740 B 138.02 KB 222 KB
[email protected]/nrf54l15/cpuapp:sample.sidewalk.demo RAM -112.64 KB 0 B 256 KB
ROM -431.64 KB 0 B 730 KB
[email protected]/nrf54l15/cpuapp:sample.sidewalk.demo.ble_only RAM -97.28 KB 0 B 256 KB
ROM -352.41 KB 0 B 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.dut RAM 23.78 KB 23.78 KB 188 KB
ROM 26.04 KB 26.04 KB 48 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello RAM 102.92 KB 102.92 KB 188 KB
ROM 431.79 KB 431.79 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only RAM 23.78 KB 23.78 KB 188 KB
ROM 26.04 KB 26.04 KB 48 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only.release RAM 23.78 KB 23.78 KB 188 KB
ROM 26.04 KB 26.04 KB 48 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello.release RAM 98.11 KB 98.11 KB 188 KB
ROM 361.57 KB 361.57 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.demo RAM 23.78 KB 23.78 KB 188 KB
ROM 26.04 KB 26.04 KB 48 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.demo.ble_only RAM 97.51 KB 97.51 KB 188 KB
ROM 352.98 KB 352.98 KB 730 KB
.config diff

.config change: https://github.com/nrfconnect/sdk-sidewalk/actions/runs/9224683317/artifacts/1535004034


./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      |	CONFIG_BT_HFP_AG_LOG_LEVEL=3
							      >	CONFIG_BT_HFP_AG_LOG_LEVEL_INHERIT=y
CONFIG_BT_LOG_LEGACY=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
CONFIG_SPI_INIT_PRIORITY=70				      |	CONFIG_SPI_INIT_PRIORITY=50
							      >	CONFIG_STD_C99=y
CONFIG_TMP112_FULL_SCALE_RUNTIME=y			      <
CONFIG_TMP112_SAMPLING_FREQUENCY_RUNTIME=y		      <
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only.release/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
CONFIG_RESET_ON_FATAL_ERROR=y				      <
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only.release/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      |	CONFIG_BT_HFP_AG_LOG_LEVEL=3
							      >	CONFIG_BT_HFP_AG_LOG_LEVEL_INHERIT=y
CONFIG_BT_LOG_LEGACY=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.ble_only/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo.ble_only/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      |	CONFIG_BT_HFP_AG_LOG_LEVEL=3
							      >	CONFIG_BT_HFP_AG_LOG_LEVEL_INHERIT=y
CONFIG_BT_LOG_LEGACY=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
CONFIG_TMP112_FULL_SCALE_RUNTIME=y			      <
CONFIG_TMP112_SAMPLING_FREQUENCY_RUNTIME=y		      <
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.demo.ble_only/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      |	CONFIG_BT_HFP_AG_LOG_LEVEL=3
							      >	CONFIG_BT_HFP_AG_LOG_LEVEL_INHERIT=y
CONFIG_BT_LOG_LEGACY=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
CONFIG_SPI_INIT_PRIORITY=70				      |	CONFIG_SPI_INIT_PRIORITY=50
							      >	CONFIG_STD_C99=y
CONFIG_TMP112_FULL_SCALE_RUNTIME=y			      <
CONFIG_TMP112_SAMPLING_FREQUENCY_RUNTIME=y		      <
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.dut/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      |	CONFIG_BT_HFP_AG_LOG_LEVEL=3
							      >	CONFIG_BT_HFP_AG_LOG_LEVEL_INHERIT=y
CONFIG_BT_LOG_LEGACY=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=0		      |	CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=90
CONFIG_SPI_INIT_PRIORITY=70				      |	CONFIG_SPI_INIT_PRIORITY=50
							      >	CONFIG_STD_C99=y
CONFIG_TMP112_FULL_SCALE_RUNTIME=y			      <
CONFIG_TMP112_SAMPLING_FREQUENCY_RUNTIME=y		      <
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.dut/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.release/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
CONFIG_BOOT_BANNER=y					      <
CONFIG_BOOT_BANNER_STRING="Booting Zephyr OS build"	      <
							      >	CONFIG_BT_CTLR_HCI=y
CONFIG_BT_HCI_RESERVE=0					      <
CONFIG_BT_HCI_VS_EXT=y					      <
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y		      <
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
CONFIG_RESET_ON_FATAL_ERROR=y				      <
CONFIG_SPI_INIT_PRIORITY=70				      |	CONFIG_SPI_INIT_PRIORITY=50
							      >	CONFIG_STD_C99=y
CONFIG_TMP112_FULL_SCALE_RUNTIME=y			      <
CONFIG_TMP112_SAMPLING_FREQUENCY_RUNTIME=y		      <
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.release/mcuboot/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y
							      >	CONFIG_LINKER_ITERABLE_SUBALIGN=4
							      >	CONFIG_LLEXT_EDK_NAME="llext-edk"
							      >	CONFIG_MEM_DOMAIN_ISOLATED_STACKS=y
							      >	CONFIG_STD_C99=y
							      >	CONFIG_TOOLCHAIN_SUPPORTS_GNU_EXTENSIONS=y

./sample-artifacts-meta/twister-out/nrf5340dk_nrf5340_cpuapp/sid_end_device/sample.sidewalk.demo/sid_end_device/zephyr/.config
old                                                           | new
							      >	CONFIG_ARCH_MEM_DOMAIN_SUPPORTS_ISOLATED_STACKS=y

Configuration diff too long to fit. Check file in artifacts.

@github-actions github-actions bot added the sid-tools PR changing Sidewalk tools label May 24, 2024
update DTS for nrf54

Signed-off-by: Robert Gałat <[email protected]>
align tests for changes in upmerge

Signed-off-by: Robert Gałat <[email protected]>
Copy link
Contributor

@ktaborowski ktaborowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loogs good overall

@rlubos rlubos merged commit 50a9f47 into nrfconnect:main May 28, 2024
56 of 57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sid-tools PR changing Sidewalk tools source PR changing src files tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants