Skip to content

Commit 5cefa6d

Browse files
gminnrlubos
authored andcommitted
memfault: remove redundant cert provisioning for nrf91x targets
Cert provisioning is now handled in the Memfault firmware SDK for nrf91x targets. `CONFIG_MEMFAULT_NCS_PROVISION_CERTIFICATES` will remain for nRF7002 targets for now which is not yet configured automatically by Memfault. Signed-off-by: Gillian Minnehan <gillian.minnehan@nordicsemi.no> Jira: CLOUDMCU-76
1 parent 60d8ac4 commit 5cefa6d

10 files changed

Lines changed: 4 additions & 12 deletions

File tree

doc/nrf/libraries/debug/memfault_ncs.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ Following are some of the configuration options that Memfault SDK defines:
110110
* :kconfig:option:`CONFIG_MEMFAULT_METRICS`
111111
* :kconfig:option:`CONFIG_MEMFAULT_METRICS_DEFAULT_SET_ENABLE`
112112
* :kconfig:option:`CONFIG_MEMFAULT_HTTP_PERIODIC_UPLOAD`
113-
* :kconfig:option:`CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM`
114113

115114
For more details on each option, use ``menuconfig`` or ``guiconfig``, and see the Kconfig sources in ``modules/lib/memfault-firmware-sdk/ports/zephyr/Kconfig``.
116115

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,9 @@ Memfault integration
816816
* Devicetree support for the internal flash coredump backend (:kconfig:option:`CONFIG_MEMFAULT_NCS_INTERNAL_FLASH_BACKED_COREDUMP`).
817817
The backend now locates its storage from a fixed partition labeled ``memfault_coredump_partition`` when Partition Manager is disabled, while continuing to support Partition Manager when enabled.
818818
* The :ref:`snippet-memfault-coredump` snippet that supplies a board-specific partition overlay for flash-backed coredump storage on common DKs and Thingy:91 or Thingy:91 X.
819+
* Removed the ``CONFIG_MEMFAULT_NCS_PROVISION_CERTIFICATES`` Kconfig option from nRF91x targets.
820+
Certificate provisioning for nRF91x targets is now handled automatically by the `Memfault firmware SDK`_.
821+
The option remains available for nRF7002 targets, which do not have automatic cert provisioning.
819822

820823
AVSystem integration
821824
--------------------

modules/memfault-firmware-sdk/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ config MEMFAULT_NCS_INIT_PRIORITY
153153

154154
config MEMFAULT_NCS_PROVISION_CERTIFICATES
155155
bool "Provision certificates on initalization"
156-
default y if MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM
157156
help
158157
Provision required TLS root certificates for connecting to Memfault's
159158
endpoints. If this option is disabled, the user is responsible for

samples/cellular/modem_shell/overlay-memfault.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y
2121
# Add to pick up support for sending Memfault data over HTTP
2222
CONFIG_MEMFAULT_HTTP_ENABLE=y
2323

24-
# nRF9160 only, uses modem to store root CAs
25-
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM=y
24+
# Certificate management
2625
CONFIG_MODEM_KEY_MGMT=y

samples/debug/memfault/README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,13 @@ Check and configure the following options in Memfault SDK that are used by the s
120120
* :kconfig:option:`CONFIG_MEMFAULT`
121121
* :kconfig:option:`CONFIG_MEMFAULT_LOGGING_ENABLE`
122122
* :kconfig:option:`CONFIG_MEMFAULT_LOG_LEVEL_DBG`
123-
* :kconfig:option:`CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM`
124123
* :kconfig:option:`CONFIG_MEMFAULT_SHELL`
125124
* :kconfig:option:`CONFIG_MEMFAULT_HTTP_ENABLE`
126125
* :kconfig:option:`CONFIG_MEMFAULT_HTTP_PERIODIC_UPLOAD`
127126
* :kconfig:option:`CONFIG_MEMFAULT_HTTP_PERIODIC_UPLOAD_INTERVAL_SECS`
128127
* :kconfig:option:`CONFIG_MEMFAULT_HTTP_PERIODIC_UPLOAD_USE_DEDICATED_WORKQUEUE`
129128
* :kconfig:option:`CONFIG_MEMFAULT_COREDUMP_COLLECT_BSS_REGIONS`
130129

131-
If :kconfig:option:`CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM` is enabled, TLS certificates used for HTTP uploads are provisioned to the nRF91 Series modem when :c:func:`memfault_zephyr_port_install_root_certs` is called.
132-
133130
Check and configure the following options for Memfault that are specific to |NCS|:
134131

135132
* :kconfig:option:`CONFIG_MEMFAULT_NCS_PROJECT_KEY`

samples/debug/memfault/boards/nrf9151dk_nrf9151_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y
2121
CONFIG_MODEM_INFO=y
2222

2323
# Certificate management
24-
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM=y
2524
CONFIG_MODEM_KEY_MGMT=y
2625

2726
# AT command capability in shell

samples/debug/memfault/boards/nrf9160dk_nrf9160_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y
2121
CONFIG_MODEM_INFO=y
2222

2323
# Certificate management
24-
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM=y
2524
CONFIG_MODEM_KEY_MGMT=y
2625

2726
# AT command capability in shell

samples/debug/memfault/boards/nrf9161dk_nrf9161_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y
2121
CONFIG_MODEM_INFO=y
2222

2323
# Certificate management
24-
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM=y
2524
CONFIG_MODEM_KEY_MGMT=y
2625

2726
# AT command capability in shell

samples/debug/memfault/boards/thingy91_nrf9160_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y
1818
CONFIG_MODEM_INFO=y
1919

2020
# Certificate management
21-
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM=y
2221
CONFIG_MODEM_KEY_MGMT=y
2322

2423
# AT command capability in shell

samples/debug/memfault/boards/thingy91x_nrf9151_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=y
1818
CONFIG_MODEM_INFO=y
1919

2020
# Certificate management
21-
CONFIG_MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM=y
2221
CONFIG_MODEM_KEY_MGMT=y
2322

2423
# AT command capability in shell

0 commit comments

Comments
 (0)