Skip to content

Commit f4ab13d

Browse files
degjorvarlubos
authored andcommitted
pcd: resolve app address from DTS when PM is disabled
pcd_find_fw_version() hard-coded fw_info_find(PM_APP_ADDRESS). That symbol is only defined by Partition Manager, so the subsystem failed to link in DTS-based builds. Fall back to PARTITION_ADDRESS(s0_partition) when PM is off, keeping the PM path unchanged for existing builds. Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
1 parent 4cadd94 commit f4ab13d

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

subsys/pcd/src/pcd.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#ifdef CONFIG_PCD_NET
1313
#ifdef CONFIG_PCD_READ_NETCORE_APP_VERSION
1414
#include <fw_info_bare.h>
15+
#include <zephyr/storage/flash_map.h>
1516
#endif
1617
#include <zephyr/storage/stream_flash.h>
1718
#endif
@@ -91,7 +92,11 @@ int pcd_find_fw_version(void)
9192
return -EFAULT;
9293
}
9394

95+
#ifdef CONFIG_PARTITION_MANAGER_ENABLED
9496
firmware_info = fw_info_find(PM_APP_ADDRESS);
97+
#else
98+
firmware_info = fw_info_find(PARTITION_ADDRESS(s0_partition));
99+
#endif
95100

96101
if (firmware_info != NULL) {
97102
memcpy((void *)pcd_cmd_p->data, &firmware_info->version, pcd_cmd_p->len);

0 commit comments

Comments
 (0)