From 04330287dda0d867120e83aa59d7204f788b0220 Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Thu, 11 Apr 2024 14:49:08 +0200 Subject: [PATCH] samples: Fix configuration scheme In this commit: - Removed redundant prj_no_dfu.conf configuration. - moved all pm_static files to samples' main directories and renamed them to be consistent with the NCS build system and partition manager requirements. - Updated documentation regarding the changes. Signed-off-by: Krzysztof Taborowski --- doc/samples/sid_end_device.rst | 6 - samples/sid_end_device/CMakeLists.txt | 13 -- .../nrf52840dk_nrf52840/pm_static_no_dfu.yml | 5 - .../pm_static_no_dfu.yml | 5 - .../pm_static_no_dfu.yml | 5 - ....yml => pm_static_nrf52840dk_nrf52840.yml} | 0 .../pm_static_nrf52840dk_nrf52840_release.yml | 73 +++++++++++ ...=> pm_static_nrf5340dk_nrf5340_cpuapp.yml} | 0 ...tatic_nrf5340dk_nrf5340_cpuapp_release.yml | 119 ++++++++++++++++++ ...pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml} | 0 ...c_nrf54l15pdk_nrf54l15_cpuapp_release.yml} | 0 ... => pm_static_thingy53_nrf5340_cpuapp.yml} | 0 samples/sid_end_device/prj_no_dfu.conf | 22 ---- samples/sid_end_device/sample.yaml | 16 --- 14 files changed, 192 insertions(+), 72 deletions(-) delete mode 100644 samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_no_dfu.yml delete mode 100644 samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_no_dfu.yml delete mode 100644 samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml rename samples/sid_end_device/{configuration/nrf52840dk_nrf52840/pm_static_dfu.yml => pm_static_nrf52840dk_nrf52840.yml} (100%) create mode 100644 samples/sid_end_device/pm_static_nrf52840dk_nrf52840_release.yml rename samples/sid_end_device/{configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml => pm_static_nrf5340dk_nrf5340_cpuapp.yml} (100%) create mode 100644 samples/sid_end_device/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml rename samples/sid_end_device/{configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml => pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml} (100%) rename samples/sid_end_device/{configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml => pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml} (100%) rename samples/sid_end_device/{configuration/thingy53_nrf5340_cpuapp/pm_static_dfu.yml => pm_static_thingy53_nrf5340_cpuapp.yml} (100%) delete mode 100644 samples/sid_end_device/prj_no_dfu.conf diff --git a/doc/samples/sid_end_device.rst b/doc/samples/sid_end_device.rst index 74367e97b5..f8ff9fc213 100644 --- a/doc/samples/sid_end_device.rst +++ b/doc/samples/sid_end_device.rst @@ -107,12 +107,6 @@ The sample supports the following build types: - All from `Requirements`_ - Release version of the application. It can be used to enable only the necessary application functionalities to optimize its performance. - * - No DFU - - :file:`prj_no_dfu.conf` - - All from `Requirements`_ - - No DFU version of the application. - It can be used in simple scenarios where DFU is not required. - Additionally, it can be treated as a starting point when integrating the Sidewalk sample with a custom bootloader. You can build the ``release`` firmware for ``build_target`` by running the following command in the project directory: diff --git a/samples/sid_end_device/CMakeLists.txt b/samples/sid_end_device/CMakeLists.txt index 2174621b4d..0783596c3b 100644 --- a/samples/sid_end_device/CMakeLists.txt +++ b/samples/sid_end_device/CMakeLists.txt @@ -13,19 +13,6 @@ include(bootloader_version.cmake) set(hci_ipc_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/hci_ipc/Kconfig.root) set(mcuboot_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/mcuboot/Kconfig.root) -# Configurations -if(CONF_FILE) - get_filename_component(CONFIG_FILE_NAME ${CONF_FILE} REALPATH) -endif() - -if("${CONFIG_FILE_NAME}" STREQUAL "prj_no_dfu.conf") - set(PM_FILENAME "pm_static_no_dfu.yml") -else() - set(PM_FILENAME "pm_static_dfu.yml") -endif() -set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/${PM_FILENAME}) - - # Zephyr CMake project find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(sidewalk_sid_end_device) diff --git a/samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_no_dfu.yml b/samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_no_dfu.yml deleted file mode 100644 index 658ce757c1..0000000000 --- a/samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_no_dfu.yml +++ /dev/null @@ -1,5 +0,0 @@ -mfg_storage: - address: 0xff000 - end_address: 0x100000 - region: flash_primary - size: 0x1000 diff --git a/samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_no_dfu.yml deleted file mode 100644 index 658ce757c1..0000000000 --- a/samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_no_dfu.yml +++ /dev/null @@ -1,5 +0,0 @@ -mfg_storage: - address: 0xff000 - end_address: 0x100000 - region: flash_primary - size: 0x1000 diff --git a/samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml deleted file mode 100644 index 658ce757c1..0000000000 --- a/samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml +++ /dev/null @@ -1,5 +0,0 @@ -mfg_storage: - address: 0xff000 - end_address: 0x100000 - region: flash_primary - size: 0x1000 diff --git a/samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml b/samples/sid_end_device/pm_static_nrf52840dk_nrf52840.yml similarity index 100% rename from samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml rename to samples/sid_end_device/pm_static_nrf52840dk_nrf52840.yml diff --git a/samples/sid_end_device/pm_static_nrf52840dk_nrf52840_release.yml b/samples/sid_end_device/pm_static_nrf52840dk_nrf52840_release.yml new file mode 100644 index 0000000000..10bf45af8a --- /dev/null +++ b/samples/sid_end_device/pm_static_nrf52840dk_nrf52840_release.yml @@ -0,0 +1,73 @@ +app: + address: 0x7200 + end_address: 0xfd000 + region: flash_primary + size: 0xf5e00 +external_flash: + address: 0xf6000 + end_address: 0x800000 + region: external_flash + size: 0x70a000 +mcuboot: + address: 0x0 + end_address: 0x7000 + region: flash_primary + size: 0x7000 +mcuboot_pad: + address: 0x7000 + end_address: 0x7200 + placement: + align: + start: 0x1000 + before: + - mcuboot_primary_app + region: flash_primary + size: 0x200 +mcuboot_primary: + address: 0x7000 + end_address: 0xfd000 + orig_span: &id001 + - app + - mcuboot_pad + region: flash_primary + size: 0xf6000 + span: *id001 +mcuboot_primary_app: + address: 0x7200 + end_address: 0xfd000 + orig_span: &id002 + - app + region: flash_primary + size: 0xf5e00 + span: *id002 +mcuboot_secondary: + address: 0x0 + device: DT_CHOSEN(nordic_pm_ext_flash) + end_address: 0xf6000 + placement: + align: + start: 0x4 + region: external_flash + share_size: + - mcuboot_primary + size: 0xf6000 +mfg_storage: + address: 0xff000 + end_address: 0x100000 + region: flash_primary + size: 0x1000 +settings_storage: + address: 0xfd000 + end_address: 0xff000 + placement: + align: + start: 0x1000 + before: + - end + region: flash_primary + size: 0x2000 +sram_primary: + address: 0x20000000 + end_address: 0x20040000 + region: sram_primary + size: 0x40000 diff --git a/samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml b/samples/sid_end_device/pm_static_nrf5340dk_nrf5340_cpuapp.yml similarity index 100% rename from samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_dfu.yml rename to samples/sid_end_device/pm_static_nrf5340dk_nrf5340_cpuapp.yml diff --git a/samples/sid_end_device/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml b/samples/sid_end_device/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml new file mode 100644 index 0000000000..5764ee5a3e --- /dev/null +++ b/samples/sid_end_device/pm_static_nrf5340dk_nrf5340_cpuapp_release.yml @@ -0,0 +1,119 @@ +EMPTY_0: + address: 0xfe000 + end_address: 0xff000 + placement: + after: + - settings_storage + region: flash_primary + size: 0x1000 +app: + address: 0x8200 + end_address: 0xfc000 + region: flash_primary + size: 0xf3e00 +external_flash: + address: 0x134000 + end_address: 0x800000 + region: external_flash + size: 0x6cc000 +mcuboot: + address: 0x0 + end_address: 0x8000 + region: flash_primary + size: 0x8000 +mcuboot_pad: + address: 0x8000 + end_address: 0x8200 + placement: + align: + start: 0x4000 + before: + - mcuboot_primary_app + region: flash_primary + size: 0x200 +mcuboot_primary: + address: 0x8000 + end_address: 0xfc000 + orig_span: &id001 + - mcuboot_pad + - app + region: flash_primary + size: 0xf4000 + span: *id001 +mcuboot_primary_1: + address: 0x0 + device: nordic_ram_flash_controller + end_address: 0x40000 + region: ram_flash + size: 0x40000 +mcuboot_primary_app: + address: 0x8200 + end_address: 0xfc000 + orig_span: &id002 + - app + region: flash_primary + size: 0xf3e00 + span: *id002 +mcuboot_secondary: + address: 0x0 + device: DT_CHOSEN(nordic_pm_ext_flash) + end_address: 0xf4000 + placement: + align: + start: 0x4 + region: external_flash + share_size: + - mcuboot_primary + size: 0xf4000 +mcuboot_secondary_1: + address: 0xf4000 + device: DT_CHOSEN(nordic_pm_ext_flash) + end_address: 0x134000 + region: external_flash + size: 0x40000 +mfg_storage: + address: 0xff000 + end_address: 0x100000 + region: flash_primary + size: 0x1000 +otp: + address: 0xff8100 + end_address: 0xff83fc + region: otp + size: 0x2fc +pcd_sram: + address: 0x20000000 + end_address: 0x20002000 + placement: + after: + - start + region: sram_primary + size: 0x2000 +ram_flash: + address: 0x40000 + end_address: 0x40000 + region: ram_flash + size: 0x0 +rpmsg_nrf53_sram: + address: 0x20070000 + end_address: 0x20080000 + placement: + before: + - end + region: sram_primary + size: 0x10000 +settings_storage: + address: 0xfc000 + end_address: 0xfe000 + placement: + align: + start: 0x4000 + before: + - end + region: flash_primary + size: 0x2000 +sram_primary: + address: 0x20002000 + end_address: 0x20070000 + region: sram_primary + size: 0x6e000 diff --git a/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml b/samples/sid_end_device/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml similarity index 100% rename from samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml rename to samples/sid_end_device/pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml diff --git a/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml similarity index 100% rename from samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml rename to samples/sid_end_device/pm_static_nrf54l15pdk_nrf54l15_cpuapp_release.yml diff --git a/samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_dfu.yml b/samples/sid_end_device/pm_static_thingy53_nrf5340_cpuapp.yml similarity index 100% rename from samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_dfu.yml rename to samples/sid_end_device/pm_static_thingy53_nrf5340_cpuapp.yml diff --git a/samples/sid_end_device/prj_no_dfu.conf b/samples/sid_end_device/prj_no_dfu.conf deleted file mode 100644 index 3f14d8c773..0000000000 --- a/samples/sid_end_device/prj_no_dfu.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -# Sidewalk -CONFIG_SIDEWALK=y -CONFIG_SIDEWALK_DFU=n -CONFIG_SMF=y - -# Log -CONFIG_LOG=y -CONFIG_LOG_PRINTK=y -CONFIG_LOG_BUFFER_SIZE=2048 -CONFIG_NVS_LOG_LEVEL_WRN=y - -# Bluetooth -CONFIG_BT_DEVICE_NAME="Nordic" - -# Debug -CONFIG_RESET_ON_FATAL_ERROR=n diff --git a/samples/sid_end_device/sample.yaml b/samples/sid_end_device/sample.yaml index b4f439d0f9..744da97f4e 100644 --- a/samples/sid_end_device/sample.yaml +++ b/samples/sid_end_device/sample.yaml @@ -32,22 +32,6 @@ tests: - nrf54l15pdk_nrf54l15_cpuapp tags: Sidewalk hello - sample.sidewalk.hello.no_dfu: - build_only: true - platform_allow: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - extra_args: - CONF_FILE=prj_no_dfu.conf - extra_configs: - - CONFIG_SID_END_DEVICE_PERSISTENT_LINK_MASK=y - integration_platforms: - - nrf52840dk_nrf52840 - - nrf5340dk_nrf5340_cpuapp - - nrf54l15pdk_nrf54l15_cpuapp - tags: Sidewalk hello - sample.sidewalk.hello.ble_only: build_only: true platform_allow: