|
25 | 25 | #include <lwm2m_engine.h> |
26 | 26 | #include <zephyr/net/coap.h> |
27 | 27 | #include <modem/modem_info.h> |
28 | | -#include <pm_config.h> |
29 | 28 | #include <zephyr/sys/reboot.h> |
30 | 29 |
|
31 | 30 | #include <zephyr/logging/log.h> |
32 | 31 | LOG_MODULE_REGISTER(lwm2m_firmware, CONFIG_LWM2M_CLIENT_UTILS_LOG_LEVEL); |
33 | 32 |
|
| 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 | + |
34 | 41 | #define BYTE_PROGRESS_STEP (1024 * 10) |
35 | 42 |
|
36 | 43 | #define LWM2M_FIRM_PREFIX "lwm2m:fir" |
@@ -1298,7 +1305,7 @@ static void lwm2m_adv_app_firmware_versions_set(void) |
1298 | 1305 |
|
1299 | 1306 | path = LWM2M_OBJ(LWM2M_OBJECT_ADV_FIRMWARE_ID, application_obj_id, |
1300 | 1307 | 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)); |
1302 | 1309 | snprintk(buf, sizeof(buf), "%d.%d.%d-%d", header.h.v1.sem_ver.major, |
1303 | 1310 | header.h.v1.sem_ver.minor, header.h.v1.sem_ver.revision, |
1304 | 1311 | header.h.v1.sem_ver.build_num); |
|
0 commit comments