Skip to content

Commit 8ddbded

Browse files
committed
memfault: fix symbol rename for device info
In #23956, rename of CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN to CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN was missed. The migration guide already has this change, so this commit just aligns the code with the migration guide. Signed-off-by: Gillian Minnehan <gillian.minnehan@nordicsemi.no>
1 parent edfa36f commit 8ddbded

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/memfault-firmware-sdk/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ config MEMFAULT_NCS_PROJECT_KEY
1313

1414
choice
1515
prompt "Choose built-in Memfault Device Info or custom implementation"
16-
default MEMFAULT_DEVICE_INFO_BUILTIN
16+
default MEMFAULT_NCS_DEVICE_INFO_BUILTIN
1717

18-
config MEMFAULT_DEVICE_INFO_BUILTIN
18+
config MEMFAULT_NCS_DEVICE_INFO_BUILTIN
1919
bool "Built-in Memfault Device Info implementation"
2020
help
2121
Use built-in Memfault Device Info implementation
@@ -29,7 +29,7 @@ config MEMFAULT_NCS_DEVICE_INFO_CUSTOM
2929

3030
endchoice
3131

32-
if MEMFAULT_DEVICE_INFO_BUILTIN
32+
if MEMFAULT_NCS_DEVICE_INFO_BUILTIN
3333

3434
choice
3535
prompt "Memfault device ID generation method"
@@ -132,7 +132,7 @@ config MEMFAULT_NCS_FW_VERSION
132132
When using a statically configured firmware version, this value
133133
will be reported to Memfault
134134

135-
endif # MEMFAULT_DEVICE_INFO_BUILTIN
135+
endif # MEMFAULT_NCS_DEVICE_INFO_BUILTIN
136136

137137
config MEMFAULT_NCS_INIT_PRIORITY
138138
int "Memfault initialization priority"

modules/memfault-firmware-sdk/memfault_integration.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ sMfltHttpClientConfig g_mflt_http_client_config = {
5757
.api_key = CONFIG_MEMFAULT_NCS_PROJECT_KEY,
5858
};
5959

60-
#if defined(CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN)
60+
#if defined(CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN)
6161
/* Firmware type check */
6262
BUILD_ASSERT(sizeof(CONFIG_MEMFAULT_NCS_FW_TYPE) > 1, "Firmware type must be configured");
6363

@@ -132,7 +132,7 @@ int memfault_ncs_device_id_set(const char *device_id, size_t len)
132132

133133
return 0;
134134
}
135-
#endif /* defined(CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN) */
135+
#endif /* defined(CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN) */
136136

137137
#if defined(CONFIG_MEMFAULT_NCS_DEVICE_ID_HW_ID)
138138
static int device_info_init(void)

0 commit comments

Comments
 (0)