Skip to content

Commit b205ca9

Browse files
lucasvdprlubos
authored andcommitted
net: lib: lwm2m_client_utils: Allow building without Partition Manager
Allow building both with and without Partition manager. Signed-off-by: Lucas van der Ploeg <lucas.vanderploeg@nordicsemi.no> (cherry picked from commit 1a88773)
1 parent 0f01e22 commit b205ca9

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,19 @@
2525
#include <lwm2m_engine.h>
2626
#include <zephyr/net/coap.h>
2727
#include <modem/modem_info.h>
28-
#include <pm_config.h>
2928
#include <zephyr/sys/reboot.h>
3029

3130
#include <zephyr/logging/log.h>
3231
LOG_MODULE_REGISTER(lwm2m_firmware, CONFIG_LWM2M_CLIENT_UTILS_LOG_LEVEL);
3332

33+
#if defined(CONFIG_PARTITION_MANAGER_ENABLED)
34+
#include <pm_config.h>
35+
#define MCUBOOT_PRIMARY_ID PM_MCUBOOT_PRIMARY_ID
36+
#else /* !CONFIG_PARTITION_MANAGER_ENABLED */
37+
#include <zephyr/storage/flash_map.h>
38+
#define MCUBOOT_PRIMARY_ID PARTITION_ID(slot0_partition)
39+
#endif /* CONFIG_PARTITION_MANAGER_ENABLED */
40+
3441
#define BYTE_PROGRESS_STEP (1024 * 10)
3542

3643
#define LWM2M_FIRM_PREFIX "lwm2m:fir"
@@ -1298,7 +1305,7 @@ static void lwm2m_adv_app_firmware_versions_set(void)
12981305

12991306
path = LWM2M_OBJ(LWM2M_OBJECT_ADV_FIRMWARE_ID, application_obj_id,
13001307
LWM2M_ADV_FOTA_CURRENT_VERSION_ID);
1301-
boot_read_bank_header(PM_MCUBOOT_PRIMARY_ID, &header, sizeof(header));
1308+
boot_read_bank_header(MCUBOOT_PRIMARY_ID, &header, sizeof(header));
13021309
snprintk(buf, sizeof(buf), "%d.%d.%d-%d", header.h.v1.sem_ver.major,
13031310
header.h.v1.sem_ver.minor, header.h.v1.sem_ver.revision,
13041311
header.h.v1.sem_ver.build_num);

0 commit comments

Comments
 (0)