From d37c9f7662c54faee0cee0578d2f85234df6bdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Thu, 23 May 2024 11:32:51 +0000 Subject: [PATCH 1/6] build: remove revision from nrf54 board in twister MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit remove revision from twister target Signed-off-by: Robert Gałat --- .github/workflows/run_tests.yml | 2 +- samples/sid_end_device/sample.yaml | 4 ++-- tests/functional/critical_region/testcase.yaml | 4 ++-- tests/functional/crypto/testcase.yaml | 4 ++-- tests/functional/interrupts/testcase.yaml | 4 ++-- tests/functional/mfg_storage/testcase.yaml | 4 ++-- tests/functional/pal_delay/testcase.yaml | 4 ++-- tests/functional/spi_bus/testcase.yaml | 4 ++-- tests/functional/storage/testcase.yaml | 4 ++-- tests/functional/temperature/testcase.yaml | 4 ++-- tests/manual/ble/sample.yaml | 4 ++-- tests/manual/log/sample.yaml | 4 ++-- tests/manual/simple_bootloader/sample.yaml | 4 ++-- tests/unit_tests/sid_ace_alloc/testcase.yaml | 4 ++-- tests/validation/crypto/testcase.yaml | 4 ++-- tests/validation/storage_kv/testcase.yaml | 4 ++-- tests/validation/timer/testcase.yaml | 4 ++-- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 2c1f334498..de8a349d3f 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -9,7 +9,7 @@ on: boards_to_test: type: string required: false - default: '["nrf52840dk/nrf52840", "nrf5340dk/nrf5340/cpuapp", "nrf54l15pdk@0.3.0/nrf54l15/cpuapp"]' + default: '["nrf52840dk/nrf52840", "nrf5340dk/nrf5340/cpuapp", "nrf54l15pdk/nrf54l15/cpuapp"]' jobs: build_manual_tests: diff --git a/samples/sid_end_device/sample.yaml b/samples/sid_end_device/sample.yaml index cfef717477..bcb1ef8054 100644 --- a/samples/sid_end_device/sample.yaml +++ b/samples/sid_end_device/sample.yaml @@ -7,11 +7,11 @@ common: platform_allow: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tests: sample.sidewalk.hello: extra_configs: diff --git a/tests/functional/critical_region/testcase.yaml b/tests/functional/critical_region/testcase.yaml index f63726f97d..e7f53551f3 100644 --- a/tests/functional/critical_region/testcase.yaml +++ b/tests/functional/critical_region/testcase.yaml @@ -1,8 +1,8 @@ tests: sidewalk.functional.critical_region: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/functional/crypto/testcase.yaml b/tests/functional/crypto/testcase.yaml index ef92dacaab..08bd4704f6 100644 --- a/tests/functional/crypto/testcase.yaml +++ b/tests/functional/crypto/testcase.yaml @@ -2,8 +2,8 @@ tests: sidewalk.functional.crypto: sysbuild: true tags: Sidewalk - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/functional/interrupts/testcase.yaml b/tests/functional/interrupts/testcase.yaml index bce1c230b0..3f8c1f1c60 100644 --- a/tests/functional/interrupts/testcase.yaml +++ b/tests/functional/interrupts/testcase.yaml @@ -2,8 +2,8 @@ tests: unity.sidewalk.functional.interrupts: sysbuild: true tags: Sidewalk - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/functional/mfg_storage/testcase.yaml b/tests/functional/mfg_storage/testcase.yaml index d042923ca3..a23672385b 100644 --- a/tests/functional/mfg_storage/testcase.yaml +++ b/tests/functional/mfg_storage/testcase.yaml @@ -3,8 +3,8 @@ tests: skip: true sysbuild: true tags: Sidewalk - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/functional/pal_delay/testcase.yaml b/tests/functional/pal_delay/testcase.yaml index 692293c594..abd7379ba5 100644 --- a/tests/functional/pal_delay/testcase.yaml +++ b/tests/functional/pal_delay/testcase.yaml @@ -1,9 +1,9 @@ tests: sidewalk.functional.delay: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk diff --git a/tests/functional/spi_bus/testcase.yaml b/tests/functional/spi_bus/testcase.yaml index 589fbc669d..dfb02feb25 100644 --- a/tests/functional/spi_bus/testcase.yaml +++ b/tests/functional/spi_bus/testcase.yaml @@ -1,11 +1,11 @@ tests: sidewalk.functional.spi_bus: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk harness: ztest harness_config: diff --git a/tests/functional/storage/testcase.yaml b/tests/functional/storage/testcase.yaml index 47dd051e57..5153d7583e 100644 --- a/tests/functional/storage/testcase.yaml +++ b/tests/functional/storage/testcase.yaml @@ -2,8 +2,8 @@ tests: sidewalk.functional.storage: sysbuild: true tags: Sidewalk - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/functional/temperature/testcase.yaml b/tests/functional/temperature/testcase.yaml index 81eca0b7ca..ea79f4c717 100644 --- a/tests/functional/temperature/testcase.yaml +++ b/tests/functional/temperature/testcase.yaml @@ -4,9 +4,9 @@ tests: platform_allow: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - # - nrf54l15pdk@0.3.0/nrf54l15/cpuapp temperature sensor not working + # - nrf54l15pdk/nrf54l15/cpuapp temperature sensor not working integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - # - nrf54l15pdk@0.3.0/nrf54l15/cpuapp temperature sensor not working + # - nrf54l15pdk/nrf54l15/cpuapp temperature sensor not working tags: Sidewalk diff --git a/tests/manual/ble/sample.yaml b/tests/manual/ble/sample.yaml index cbcda1af3c..1e98e07223 100644 --- a/tests/manual/ble/sample.yaml +++ b/tests/manual/ble/sample.yaml @@ -4,10 +4,10 @@ sample: tests: sidewalk.test.ble: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk diff --git a/tests/manual/log/sample.yaml b/tests/manual/log/sample.yaml index 94bb4b8b7f..5f21047060 100644 --- a/tests/manual/log/sample.yaml +++ b/tests/manual/log/sample.yaml @@ -4,10 +4,10 @@ sample: tests: sidewalk.test.log: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp build_only: true integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk diff --git a/tests/manual/simple_bootloader/sample.yaml b/tests/manual/simple_bootloader/sample.yaml index eadbe0b1bf..753fe9b057 100644 --- a/tests/manual/simple_bootloader/sample.yaml +++ b/tests/manual/simple_bootloader/sample.yaml @@ -5,9 +5,9 @@ tests: sidewalk.test.simple_bootloader: sysbuild: true build_only: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk diff --git a/tests/unit_tests/sid_ace_alloc/testcase.yaml b/tests/unit_tests/sid_ace_alloc/testcase.yaml index c734cb4896..edcf9a03f5 100644 --- a/tests/unit_tests/sid_ace_alloc/testcase.yaml +++ b/tests/unit_tests/sid_ace_alloc/testcase.yaml @@ -5,9 +5,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - native_posix - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk integration_platforms: - native_posix - nrf52840dk/nrf52840 - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/validation/crypto/testcase.yaml b/tests/validation/crypto/testcase.yaml index fb06286198..e5226f8e56 100644 --- a/tests/validation/crypto/testcase.yaml +++ b/tests/validation/crypto/testcase.yaml @@ -4,9 +4,9 @@ tests: platform_allow: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/validation/storage_kv/testcase.yaml b/tests/validation/storage_kv/testcase.yaml index 3ca6b31a5c..91687bdb3f 100644 --- a/tests/validation/storage_kv/testcase.yaml +++ b/tests/validation/storage_kv/testcase.yaml @@ -1,9 +1,9 @@ tests: sidewalk.sid_validation.pal_storage_kv: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp diff --git a/tests/validation/timer/testcase.yaml b/tests/validation/timer/testcase.yaml index 23870dc66b..86f5b78a69 100644 --- a/tests/validation/timer/testcase.yaml +++ b/tests/validation/timer/testcase.yaml @@ -1,9 +1,9 @@ tests: sidewalk.sid_validation.pal_timer: sysbuild: true - platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp tags: Sidewalk integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp + - nrf54l15pdk/nrf54l15/cpuapp From 5c64194fca3bdf878dd887690d8af42518c50fd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Tue, 21 May 2024 06:51:27 +0000 Subject: [PATCH 2/6] sample: smf_api align with api change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit new SMF api has more arguments. Signed-off-by: Robert Gałat --- samples/sid_end_device/src/sensor_monitoring/app_tx.c | 7 ++++--- samples/sid_end_device/src/sidewalk.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/samples/sid_end_device/src/sensor_monitoring/app_tx.c b/samples/sid_end_device/src/sensor_monitoring/app_tx.c index e2f0f63ef0..6773184c97 100644 --- a/samples/sid_end_device/src/sensor_monitoring/app_tx.c +++ b/samples/sid_end_device/src/sensor_monitoring/app_tx.c @@ -46,9 +46,10 @@ static void state_notify_data(void *o); static void button_timer_cb(struct k_timer *timer_id); static const struct smf_state app_states[] = { - [STATE_APP_INIT] = SMF_CREATE_STATE(NULL, state_init, NULL), - [STATE_APP_NOTIFY_CAPABILITY] = SMF_CREATE_STATE(NULL, state_notify_capability, NULL), - [STATE_APP_NOTIFY_DATA] = SMF_CREATE_STATE(NULL, state_notify_data, NULL), + [STATE_APP_INIT] = SMF_CREATE_STATE(NULL, state_init, NULL, NULL, NULL), + [STATE_APP_NOTIFY_CAPABILITY] = + SMF_CREATE_STATE(NULL, state_notify_capability, NULL, NULL, NULL), + [STATE_APP_NOTIFY_DATA] = SMF_CREATE_STATE(NULL, state_notify_data, NULL, NULL, NULL), }; static uint8_t __aligned(4) diff --git a/samples/sid_end_device/src/sidewalk.c b/samples/sid_end_device/src/sidewalk.c index 373b33edda..dd23c72dda 100644 --- a/samples/sid_end_device/src/sidewalk.c +++ b/samples/sid_end_device/src/sidewalk.c @@ -80,8 +80,8 @@ static void state_dfu_run(void *o); static const struct smf_state sid_states[] = { [STATE_SIDEWALK] = - SMF_CREATE_STATE(state_sidewalk_entry, state_sidewalk_run, state_sidewalk_exit), - [STATE_DFU] = SMF_CREATE_STATE(state_dfu_entry, state_dfu_run, NULL), + SMF_CREATE_STATE(state_sidewalk_entry, state_sidewalk_run, state_sidewalk_exit, NULL, NULL), + [STATE_DFU] = SMF_CREATE_STATE(state_dfu_entry, state_dfu_run, NULL, NULL, NULL), }; static uint8_t __aligned(4) From 40428be7bd637321ca07224c0583f15e06711a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Thu, 23 May 2024 12:24:12 +0000 Subject: [PATCH 3/6] build: disable boot_banner for bootloader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- samples/sid_end_device/child_image/mcuboot/prj.conf | 1 + samples/sid_end_device/child_image/mcuboot/prj_release.conf | 1 + samples/sid_end_device/sysbuild/mcuboot/prj.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/samples/sid_end_device/child_image/mcuboot/prj.conf b/samples/sid_end_device/child_image/mcuboot/prj.conf index 75d0279299..d64edc2ff5 100644 --- a/samples/sid_end_device/child_image/mcuboot/prj.conf +++ b/samples/sid_end_device/child_image/mcuboot/prj.conf @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_MINIMAL_LIBC=y # Bootloader size optimization +CONFIG_NCS_BOOT_BANNER=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/sid_end_device/child_image/mcuboot/prj_release.conf b/samples/sid_end_device/child_image/mcuboot/prj_release.conf index 75d0279299..d64edc2ff5 100644 --- a/samples/sid_end_device/child_image/mcuboot/prj_release.conf +++ b/samples/sid_end_device/child_image/mcuboot/prj_release.conf @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_MINIMAL_LIBC=y # Bootloader size optimization +CONFIG_NCS_BOOT_BANNER=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/sid_end_device/sysbuild/mcuboot/prj.conf b/samples/sid_end_device/sysbuild/mcuboot/prj.conf index 75d0279299..d64edc2ff5 100644 --- a/samples/sid_end_device/sysbuild/mcuboot/prj.conf +++ b/samples/sid_end_device/sysbuild/mcuboot/prj.conf @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_MINIMAL_LIBC=y # Bootloader size optimization +CONFIG_NCS_BOOT_BANNER=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n From 9b0c95e90e43d3041ffd472446c36fde664bb1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Thu, 23 May 2024 12:39:57 +0000 Subject: [PATCH 4/6] dfu: replace deprecated macro for adv params MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use the same macro as DFU sample from zephyr. Signed-off-by: Robert Gałat --- utils/src/nordic_dfu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/nordic_dfu.c b/utils/src/nordic_dfu.c index 992d7b5591..eb036f7529 100644 --- a/utils/src/nordic_dfu.c +++ b/utils/src/nordic_dfu.c @@ -123,7 +123,7 @@ int nordic_dfu_ble_start(void) mgmt_callback_register(&dfu_mode_mgmt_cb); - err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0); + err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0); if (err) { LOG_ERR("Bluetooth advertising start failed (err %d)", err); return err; From 85a8ad643a6cf8183822d0d8df53710854f883b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Fri, 24 May 2024 11:45:47 +0000 Subject: [PATCH 5/6] build: update nrf54 dts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit update DTS for nrf54 Signed-off-by: Robert Gałat --- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay | 5 +++++ samples/sid_end_device/sysbuild/hci_ipc/prj.conf | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay b/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay index a33c0d96d8..0885e3e6c5 100644 --- a/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay +++ b/samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay @@ -5,6 +5,11 @@ */ +/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ +&cpuapp_rram { + reg = < 0x0 DT_SIZE_K(1524) >; +}; + &pinctrl { spi21_default: spi21_default { group1 { diff --git a/samples/sid_end_device/sysbuild/hci_ipc/prj.conf b/samples/sid_end_device/sysbuild/hci_ipc/prj.conf index 77a23bfdc5..7bfbc49cd6 100644 --- a/samples/sid_end_device/sysbuild/hci_ipc/prj.conf +++ b/samples/sid_end_device/sysbuild/hci_ipc/prj.conf @@ -17,7 +17,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since # Host number of completed commands does not follow normal flow control. From c45fb28b6167183a4714d3f80530faa1c726bed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Ga=C5=82at?= Date: Fri, 24 May 2024 12:52:31 +0000 Subject: [PATCH 6/6] tests: fix tests for upmerge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit align tests for changes in upmerge Signed-off-by: Robert Gałat --- .../boards/nrf54l15pdk_nrf54l15_cpuapp.overlay | 11 +++++++++++ .../simple_bootloader/sysbuild/mcuboot/prj.conf | 1 + tests/unit_tests/sid_dut_shell/mock/shell_mock.h | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 tests/manual/simple_bootloader/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay diff --git a/tests/manual/simple_bootloader/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/tests/manual/simple_bootloader/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay new file mode 100644 index 0000000000..8edfb6476e --- /dev/null +++ b/tests/manual/simple_bootloader/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + + +/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ +&cpuapp_rram { + reg = < 0x0 DT_SIZE_K(1524) >; +}; diff --git a/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf b/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf index 75d0279299..d64edc2ff5 100644 --- a/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf +++ b/tests/manual/simple_bootloader/sysbuild/mcuboot/prj.conf @@ -20,6 +20,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_MINIMAL_LIBC=y # Bootloader size optimization +CONFIG_NCS_BOOT_BANNER=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/tests/unit_tests/sid_dut_shell/mock/shell_mock.h b/tests/unit_tests/sid_dut_shell/mock/shell_mock.h index 06ae6e2ce0..7e7c9d1d81 100644 --- a/tests/unit_tests/sid_dut_shell/mock/shell_mock.h +++ b/tests/unit_tests/sid_dut_shell/mock/shell_mock.h @@ -9,5 +9,5 @@ DEFINE_FFF_GLOBALS; -FAKE_VOID_FUNC_VARARG(shell_fprintf, const struct shell *, enum shell_vt100_color, const char *, - ...); +FAKE_VOID_FUNC_VARARG(shell_fprintf_impl, const struct shell *, enum shell_vt100_color, + const char *, ...);