Skip to content

Commit f39b485

Browse files
noahprlubos
authored andcommitted
modules: memfault: Default FW version is APPVERSION
Set default `CONFIG_MEMFAULT_NCS_FW_VERSION` to be pulled from a `VERSION` file, if present, otherwise no default (which will cause a build error). This applies when `CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y`. With this change, all the needed version Kconfigs can be set from the `VERSION` file, instead of needing to set them individually: - `CONFIG_BT_DIS_FW_REV_STR`: used for BT DFU - `CONFIG_MCUBOOT_IMGTOOL_SIGN_VERSION`: not strictly used, but nice for consistency - `CONFIG_MEMFAULT_NCS_FW_VERSION`: used when reporting data to Memfault Signed-off-by: Noah Pendleton <noah.pendleton@nordicsemi.no>
1 parent f903bed commit f39b485

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,8 @@ Memfault integration
878878

879879
* The ``CONFIG_MEMFAULT_DEVICE_INFO_CUSTOM`` Kconfig option has been renamed to :kconfig:option:`CONFIG_MEMFAULT_NCS_DEVICE_INFO_CUSTOM`.
880880
* The ``CONFIG_MEMFAULT_DEVICE_INFO_BUILTIN`` Kconfig option has been renamed to :kconfig:option:`CONFIG_MEMFAULT_NCS_DEVICE_INFO_BUILTIN`.
881+
* The :kconfig:option:`CONFIG_MEMFAULT_NCS_FW_VERSION` Kconfig option will now have a default value set from a :file:`VERSION` file, if present in the application root directory.
882+
Previously, this option had no default value.
881883

882884
* Added a metric tracking the unused stack space of the Bluetooth Long workqueue thread, when the :kconfig:option:`CONFIG_MEMFAULT_NCS_BT_METRICS` Kconfig option is enabled.
883885
The new metric is named ``ncs_bt_lw_wq_unused_stack``.

modules/memfault-firmware-sdk/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ config MEMFAULT_NCS_FW_VERSION_PREFIX
118118
config MEMFAULT_NCS_FW_VERSION
119119
string "Static firmware version to use"
120120
depends on MEMFAULT_NCS_FW_VERSION_STATIC
121+
default "$(APP_VERSION_TWEAK_STRING)" if "$(VERSION_MAJOR)" != ""
121122
help
122123
When using a statically configured firmware version, this value
123124
will be reported to Memfault

0 commit comments

Comments
 (0)