Skip to content

Commit 370fa5a

Browse files
committed
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 <krzysztof.taborowski@nordicsemi.no>
1 parent 3ed5cba commit 370fa5a

18 files changed

Lines changed: 334 additions & 98 deletions

doc/samples/sid_end_device.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,6 @@ The sample supports the following build types:
111111
- All from `Requirements`_
112112
- Release version of the application.
113113
It can be used to enable only the necessary application functionalities to optimize its performance.
114-
* - No DFU
115-
- :file:`prj_no_dfu.conf`
116-
- All from `Requirements`_
117-
- No DFU version of the application.
118-
It can be used in simple scenarios where DFU is not required.
119-
Additionally, it can be treated as a starting point when integrating the Sidewalk sample with a custom bootloader.
120114

121115
You can build the ``release`` firmware for ``build_target`` by running the following command in the project directory:
122116

samples/sid_end_device/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ include(bootloader_version.cmake)
1313
set(hci_ipc_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/hci_ipc/Kconfig.root)
1414
set(mcuboot_KCONFIG_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/child_image/mcuboot/Kconfig.root)
1515

16-
# Configurations
17-
if("prj_no_dfu.conf" IN_LIST CONF_FILE)
18-
set(PM_FILENAME "pm_static_no_dfu.yml")
19-
else()
20-
set(PM_FILENAME "pm_static_dfu.yml")
21-
endif()
22-
set(PM_STATIC_YML_FILE ${CMAKE_CURRENT_SOURCE_DIR}/configuration/${BOARD}/${PM_FILENAME})
23-
2416
# Zephyr CMake project
2517
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
2618
project(sidewalk_sid_end_device)

samples/sid_end_device/boards/nrf54l15pdk_nrf54l15_cpuapp_no_dfu.conf

Lines changed: 0 additions & 13 deletions
This file was deleted.

samples/sid_end_device/boards/thingy53_nrf5340_cpuapp_no_dfu.conf

Lines changed: 0 additions & 10 deletions
This file was deleted.

samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_no_dfu.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

samples/sid_end_device/configuration/nrf5340dk_nrf5340_cpuapp/pm_static_no_dfu.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_dfu.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

samples/sid_end_device/configuration/nrf54l15pdk_nrf54l15_cpuapp/pm_static_no_dfu.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

samples/sid_end_device/configuration/thingy53_nrf5340_cpuapp/pm_static_no_dfu.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

samples/sid_end_device/configuration/nrf52840dk_nrf52840/pm_static_dfu.yml renamed to samples/sid_end_device/pm_static_nrf52840dk_nrf52840.yml

File renamed without changes.

0 commit comments

Comments
 (0)