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 <[email protected]>
nrfconnect · Apr 11, 2024 · 1376008 · 1376008
1 parent 47cf235
commit 1376008
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 76 deletions.
diff --git 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
@@ -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
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
diff --git a/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml b/samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml
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
diff --git a/...ion/nrf52840dk_nrf52840/pm_static_dfu.yml → ..._device/pm_static_nrf52840dk_nrf52840.yml b/...ion/nrf52840dk_nrf52840/pm_static_dfu.yml → ..._device/pm_static_nrf52840dk_nrf52840.yml
diff --git a/...rf5340dk_nrf5340_cpuapp/pm_static_dfu.yml → ...ce/pm_static_nrf5340dk_nrf5340_cpuapp.yml b/...rf5340dk_nrf5340_cpuapp/pm_static_dfu.yml → ...ce/pm_static_nrf5340dk_nrf5340_cpuapp.yml
diff --git a/...4l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml → ...pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml b/...4l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml → ...pm_static_nrf54l15pdk_nrf54l15_cpuapp.yml
diff --git a/...thingy53_nrf5340_cpuapp/pm_static_dfu.yml → ...ice/pm_static_thingy53_nrf5340_cpuapp.yml b/...thingy53_nrf5340_cpuapp/pm_static_dfu.yml → ...ice/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
diff --git 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: