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

treewide: align with HWMv2 #543

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Conversation

gmarull
Copy link
Member

@gmarull gmarull commented Apr 13, 2024

Adjust all board references to match the new HWMv2 scheme.

CI parameters

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

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

(branch, hash, pull/XXX/head)
NRF_revision=pull/14626/head

manifest-pr-skip (remove this line to create PR in NRF)

Description

JIRA ticket:

Detail description of the change

Self review

  • There is no commented code.
  • There is no TODO/FIXME comments without associated issue ticket.
  • Commits are properly organized
  • Verification
    • Unit tests were updated to include the change.
    • Change has been tested.

@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. scripts source PR changing src files tests labels Apr 13, 2024
@RobertGalatNordic RobertGalatNordic force-pushed the upmerge-25032024 branch 3 times, most recently from 2741ee9 to 8e26a49 Compare April 17, 2024 07:44
Copy link

github-actions bot commented Apr 17, 2024

Sample diff used total
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.dut RAM -121.53 KB 0 B 256 KB
ROM -413.53 KB 0 B 730 KB
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.hello RAM -87.9 KB 0 B 256 KB
ROM -349.99 KB 0 B 730 KB
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.hello.ble_only RAM -87.9 KB 0 B 256 KB
ROM -349.74 KB 0 B 730 KB
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.hello.ble_only.release RAM -83.06 KB 0 B 256 KB
ROM -284.92 KB 0 B 730 KB
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.hello.release RAM -83.06 KB 0 B 256 KB
ROM -285.06 KB 0 B 730 KB
thingy53_nrf5340_cpuapp:sample.sidewalk.demo.ble_only RAM -102.42 KB 0 B 440 KB
ROM -391.3 KB 0 B 975.5 KB
nrf52840dk_nrf52840:sample.sidewalk.demo RAM -119.83 KB 0 B 256 KB
ROM -495.05 KB 0 B 983.5 KB
nrf52840dk_nrf52840:sample.sidewalk.demo.ble_only RAM -104.33 KB 0 B 256 KB
ROM -412.8 KB 0 B 983.5 KB
nrf52840dk_nrf52840:sample.sidewalk.dut RAM -143.21 KB 0 B 256 KB
ROM -553.33 KB 0 B 983.5 KB
nrf52840dk_nrf52840:sample.sidewalk.hello RAM -109.71 KB 0 B 256 KB
ROM -494.67 KB 0 B 983.5 KB
nrf52840dk_nrf52840:sample.sidewalk.hello.ble_only RAM -94.21 KB 0 B 256 KB
ROM -412.18 KB 0 B 983.5 KB
nrf52840dk_nrf52840:sample.sidewalk.hello.ble_only.release RAM -89.21 KB 0 B 256 KB
ROM -351.51 KB 0 B 983.5 KB
nrf52840dk_nrf52840:sample.sidewalk.hello.release RAM -104.83 KB 0 B 256 KB
ROM -429.86 KB 0 B 983.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.demo RAM -108.09 KB 0 B 440 KB
ROM -433.45 KB 0 B 975.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.demo.ble_only RAM -92.89 KB 0 B 440 KB
ROM -354.8 KB 0 B 975.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.dut RAM -131.55 KB 0 B 440 KB
ROM -491.78 KB 0 B 975.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.hello RAM -98.18 KB 0 B 440 KB
ROM -433.16 KB 0 B 975.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.hello.ble_only RAM -82.97 KB 0 B 440 KB
ROM -354.48 KB 0 B 975.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.hello.ble_only.release RAM -78.26 KB 0 B 440 KB
ROM -290.84 KB 0 B 975.5 KB
nrf5340dk_nrf5340_cpuapp:sample.sidewalk.hello.release RAM -93.46 KB 0 B 440 KB
ROM -366.26 KB 0 B 975.5 KB
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.demo RAM -97.86 KB 0 B 256 KB
ROM -350.57 KB 0 B 730 KB
nrf54l15pdk_nrf54l15_cpuapp:sample.sidewalk.demo.ble_only RAM -97.86 KB 0 B 256 KB
ROM -350.32 KB 0 B 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.dut RAM 121.52 KB 121.52 KB 256 KB
ROM 414.18 KB 414.18 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello RAM 87.88 KB 87.88 KB 256 KB
ROM 350.4 KB 350.4 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only RAM 87.88 KB 87.88 KB 256 KB
ROM 350.14 KB 350.14 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello.ble_only.release RAM 83.06 KB 83.06 KB 256 KB
ROM 284.97 KB 284.97 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.hello.release RAM 83.06 KB 83.06 KB 256 KB
ROM 285.09 KB 285.09 KB 730 KB
thingy53/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 102.34 KB 102.34 KB 440 KB
ROM 391.91 KB 391.91 KB 975.5 KB
nrf52840dk/nrf52840:sample.sidewalk.demo RAM 119.77 KB 119.77 KB 256 KB
ROM 495.38 KB 495.38 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.demo.ble_only RAM 104.39 KB 104.39 KB 256 KB
ROM 413.18 KB 413.18 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.dut RAM 143.27 KB 143.27 KB 256 KB
ROM 553.81 KB 553.81 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.hello RAM 109.64 KB 109.64 KB 256 KB
ROM 495 KB 495 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.hello.ble_only RAM 94.14 KB 94.14 KB 256 KB
ROM 412.56 KB 412.56 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.hello.ble_only.release RAM 89.27 KB 89.27 KB 256 KB
ROM 351.53 KB 351.53 KB 983.5 KB
nrf52840dk/nrf52840:sample.sidewalk.hello.release RAM 104.77 KB 104.77 KB 256 KB
ROM 429.82 KB 429.82 KB 983.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo RAM 108.05 KB 108.05 KB 440 KB
ROM 434.24 KB 434.24 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.demo.ble_only RAM 92.88 KB 92.88 KB 440 KB
ROM 355.62 KB 355.62 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.dut RAM 131.53 KB 131.53 KB 440 KB
ROM 492.73 KB 492.73 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello RAM 98.14 KB 98.14 KB 440 KB
ROM 433.94 KB 433.94 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only RAM 82.95 KB 82.95 KB 440 KB
ROM 355.28 KB 355.28 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.ble_only.release RAM 78.27 KB 78.27 KB 440 KB
ROM 291.07 KB 291.07 KB 975.5 KB
nrf5340dk/nrf5340/cpuapp:sample.sidewalk.hello.release RAM 93.45 KB 93.45 KB 440 KB
ROM 366.46 KB 366.46 KB 975.5 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.demo RAM 97.83 KB 97.83 KB 256 KB
ROM 350.98 KB 350.98 KB 730 KB
nrf54l15pdk/nrf54l15/cpuapp:sample.sidewalk.demo.ble_only RAM 97.83 KB 97.83 KB 256 KB
ROM 350.72 KB 350.72 KB 730 KB
.config diff

.config change: https://github.com/nrfconnect/sdk-sidewalk/actions/runs/8850602714/artifacts/1451344765


./manual-tests-artifacts/twister-out/nrf52840dk_nrf52840/log/sidewalk.test.log/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf52840dk_nrf52840"			      |	CONFIG_BOARD="nrf52840dk"
							      >	CONFIG_BOARD_NRF52840DK=y
							      >	CONFIG_BOARD_QUALIFIERS="nrf52840"
							      >	CONFIG_BOARD_TARGET="nrf52840dk/nrf52840"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
							      >	CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=y
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nRF52840_QIAA"				      |	CONFIG_SOC="nrf52840"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf52840dk_nrf52840/ble/sidewalk.test.ble/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf52840dk_nrf52840"			      |	CONFIG_BOARD="nrf52840dk"
							      >	CONFIG_BOARD_NRF52840DK=y
							      >	CONFIG_BOARD_QUALIFIERS="nrf52840"
							      >	CONFIG_BOARD_TARGET="nrf52840dk/nrf52840"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
							      >	CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=y
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nRF52840_QIAA"				      |	CONFIG_SOC="nrf52840"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf52840dk_nrf52840/simple_bootloader/sidewalk.test.simple_bootloader/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf52840dk_nrf52840"			      |	CONFIG_BOARD="nrf52840dk"
							      >	CONFIG_BOARD_NRF52840DK=y
							      >	CONFIG_BOARD_QUALIFIERS="nrf52840"
							      >	CONFIG_BOARD_TARGET="nrf52840dk/nrf52840"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nRF52840_QIAA"				      |	CONFIG_SOC="nrf52840"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf5340dk_nrf5340_cpuapp/log/sidewalk.test.log/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf5340dk_nrf5340_cpuapp"			      |	CONFIG_BOARD="nrf5340dk"
							      >	CONFIG_BOARD_NRF5340DK=y
							      >	CONFIG_BOARD_QUALIFIERS="nrf5340/cpuapp"
							      >	CONFIG_BOARD_TARGET="nrf5340dk/nrf5340/cpuapp"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
CONFIG_DOMAIN_CPUNET_BOARD="nrf5340dk_nrf5340_cpunet"	      |	CONFIG_DOMAIN_CPUNET_BOARD="nrf5340dk/nrf5340/cpunet"
							      >	CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=y
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nRF5340_CPUAPP_QKAA"			      |	CONFIG_SOC="nrf5340"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
							      >	CONFIG_SOC_NRF53_CPUNET_MGMT=y
CONFIG_TFM_BOARD="/__w/sdk-sidewalk/sdk-sidewalk/zephyr/modul |	CONFIG_TFM_BOARD="/__w/sdk-sidewalk/sdk-sidewalk/zephyr/modul
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf5340dk_nrf5340_cpuapp/ble/sidewalk.test.ble/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf5340dk_nrf5340_cpuapp"			      |	CONFIG_BOARD="nrf5340dk"
							      >	CONFIG_BOARD_NRF5340DK=y
							      >	CONFIG_BOARD_QUALIFIERS="nrf5340/cpuapp"
							      >	CONFIG_BOARD_TARGET="nrf5340dk/nrf5340/cpuapp"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
CONFIG_DOMAIN_CPUNET_BOARD="nrf5340dk_nrf5340_cpunet"	      |	CONFIG_DOMAIN_CPUNET_BOARD="nrf5340dk/nrf5340/cpunet"
							      >	CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=y
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nRF5340_CPUAPP_QKAA"			      |	CONFIG_SOC="nrf5340"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
							      >	CONFIG_SOC_NRF53_CPUNET_MGMT=y
CONFIG_TFM_BOARD="/__w/sdk-sidewalk/sdk-sidewalk/zephyr/modul |	CONFIG_TFM_BOARD="/__w/sdk-sidewalk/sdk-sidewalk/zephyr/modul
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf5340dk_nrf5340_cpuapp/simple_bootloader/sidewalk.test.simple_bootloader/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf5340dk_nrf5340_cpuapp"			      |	CONFIG_BOARD="nrf5340dk"
							      >	CONFIG_BOARD_NRF5340DK=y
							      >	CONFIG_BOARD_QUALIFIERS="nrf5340/cpuapp"
							      >	CONFIG_BOARD_TARGET="nrf5340dk/nrf5340/cpuapp"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
CONFIG_DOMAIN_CPUNET_BOARD="nrf5340dk_nrf5340_cpunet"	      |	CONFIG_DOMAIN_CPUNET_BOARD="nrf5340dk/nrf5340/cpunet"
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nRF5340_CPUAPP_QKAA"			      |	CONFIG_SOC="nrf5340"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
							      >	CONFIG_SOC_NRF53_CPUNET_MGMT=y
CONFIG_TFM_BOARD="/__w/sdk-sidewalk/sdk-sidewalk/zephyr/modul |	CONFIG_TFM_BOARD="/__w/sdk-sidewalk/sdk-sidewalk/zephyr/modul
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf54l15pdk_nrf54l15_cpuapp/log/sidewalk.test.log/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf54l15pdk_nrf54l15_cpuapp"		      |	CONFIG_BOARD="nrf54l15pdk"
							      >	CONFIG_BOARD_ENABLE_DCDC=y
							      >	CONFIG_BOARD_NRF54L15PDK=y
CONFIG_BOARD_REVISION="0.2.0"				      |	CONFIG_BOARD_QUALIFIERS="nrf54l15/cpuapp"
							      >	CONFIG_BOARD_REVISION="0.2.1"
							      >	CONFIG_BOARD_TARGET="[email protected]/nrf54l15/cpuapp"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
							      >	CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=y
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nrf54l15_cpuapp"				      |	CONFIG_SOC="nrf54l15"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
							      >	CONFIG_SOC_NRF54L_VREG_MAIN_DCDC=y
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf54l15pdk_nrf54l15_cpuapp/ble/sidewalk.test.ble/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf54l15pdk_nrf54l15_cpuapp"		      |	CONFIG_BOARD="nrf54l15pdk"
							      >	CONFIG_BOARD_ENABLE_DCDC=y
							      >	CONFIG_BOARD_NRF54L15PDK=y
CONFIG_BOARD_REVISION="0.2.0"				      |	CONFIG_BOARD_QUALIFIERS="nrf54l15/cpuapp"
							      >	CONFIG_BOARD_REVISION="0.2.1"
							      >	CONFIG_BOARD_TARGET="[email protected]/nrf54l15/cpuapp"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
							      >	CONFIG_MCUMGR_TRANSPORT_BT_DYNAMIC_SVC_REGISTRATION=y
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nrf54l15_cpuapp"				      |	CONFIG_SOC="nrf54l15"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
							      >	CONFIG_SOC_NRF54L_VREG_MAIN_DCDC=y
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./manual-tests-artifacts/twister-out/nrf54l15pdk_nrf54l15_cpuapp/simple_bootloader/sidewalk.test.simple_bootloader/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf54l15pdk_nrf54l15_cpuapp"		      |	CONFIG_BOARD="nrf54l15pdk"
							      >	CONFIG_BOARD_ENABLE_DCDC=y
							      >	CONFIG_BOARD_NRF54L15PDK=y
CONFIG_BOARD_REVISION="0.2.0"				      |	CONFIG_BOARD_QUALIFIERS="nrf54l15/cpuapp"
							      >	CONFIG_BOARD_REVISION="0.2.1"
							      >	CONFIG_BOARD_TARGET="[email protected]/nrf54l15/cpuapp"
CONFIG_CLOCK_CONTROL_NPCX_SUPP_APB4=y			      <
							      >	CONFIG_POSIX_ENV_LOG_LEVEL=3
							      >	CONFIG_POSIX_ENV_LOG_LEVEL_DEFAULT=y
CONFIG_SERIAL_INIT_PRIORITY=55				      |	CONFIG_SERIAL_INIT_PRIORITY=50
CONFIG_SOC="nrf54l15_cpuapp"				      |	CONFIG_SOC="nrf54l15"
CONFIG_SOC_FAMILY_NRF=y					      |	CONFIG_SOC_FAMILY_NORDIC_NRF=y
							      >	CONFIG_SOC_NRF54L_VREG_MAIN_DCDC=y
CONFIG_WIFI_NM_WPA_SUPPLICANT_DEBUG_LEVEL=6		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL=3		      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_LOG_LEVEL_DEFAULT=y	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_THREAD_STACK_SIZE=8192	      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_PRIO=7			      <
CONFIG_WIFI_NM_WPA_SUPPLICANT_WQ_STACK_SIZE=4096	      <

./sample-artifacts-meta/twister-out/nrf52840dk_nrf52840/sid_end_device/sample.sidewalk.hello.release/mcuboot/zephyr/.config
old                                                           | new
CONFIG_BOARD="nrf52840dk_nrf52840"			      |	CONFIG_BOARD="nrf52840dk"

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

@gmarull gmarull force-pushed the upmerge-25032024 branch 2 times, most recently from 4cba40a to fb13b49 Compare April 23, 2024 08:37
@gmarull
Copy link
Member Author

gmarull commented Apr 24, 2024

Hi, the Sidewalk is using soc names in places like:

  • sources e.g.
    #ifndef DEV_ID_REG
    #if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(NRF52832_XXAA)
    #define DEV_ID_REG (uint32_t)(NRF_FICR->DEVICEID[0])
    #elif defined(NRF5340_XXAA)
    #if defined(NRF_APPLICATION)
    #define DEV_ID_REG (uint32_t)(NRF_FICR_S->INFO.DEVICEID[0])
    #elif defined(NRF_NETWORK)
    #define DEV_ID_REG (uint32_t)(NRF_FICR_NS->INFO.DEVICEID[0])
    #endif /* NRF5340_XXAA */
    #elif defined(NRF54L15_ENGA_XXAA)
    #define DEV_ID_REG (uint32_t)(NRF_FICR->INFO.DEVICEID[0])
    #else
    #error "Unknow Device ID register."
    #endif
    #endif /* DEV_ID_REG */

these are HAL definitions, does not change

  • kconfigs e.g.
    config SIDEWALK_NRF54L15_SUPPORT
    bool "Sidewalk support for nRF54L15 [EXPERIMENTAL]"
    select EXPERIMENTAL
    default SOC_NRF54L15 && SIDEWALK

this looks a bit weird, @tejlmand @nordicjm can you check?

  • cmakes e.g.

    if(CONFIG_SOC_SERIES_NRF53X)
    zephyr_library_sources_ifdef(CONFIG_SIDEWALK_TEMPERATURE sid_temperature_mock.c)
    message("Note: Sidewalk uses MOCK temperature implementation")
    else()
    zephyr_library_sources_ifdef(CONFIG_SIDEWALK_TEMPERATURE sid_temperature.c)
    endif() # CONFIG_SOC_SERIES_NRF53X

    Will it be affected by the new hardware model?

CONFIG_SOC_SERIES_NRF53X still exists.

@ktaborowski ktaborowski force-pushed the upmerge-25032024 branch 5 times, most recently from 8ac475a to 39d3995 Compare April 25, 2024 11:50
Adjust all board references to match the new HWMv2 scheme.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
GH action Error: The artifact name is not valid:
Contains the following character: Forward slash.

Signed-off-by: Krzysztof Taborowski <[email protected]>
@gmarull gmarull dismissed ktaborowski’s stale review April 30, 2024 14:29

agreed to merge with failure, to be addressed post-upmerge

@gmarull gmarull merged commit 2f8856f into nrfconnect:main Apr 30, 2024
54 of 56 checks passed
@gmarull gmarull deleted the upmerge-25032024 branch April 30, 2024 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc-required PR must not be merged without tech writer approval. scripts source PR changing src files tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants