From 35d087e60de25018d664c96872f6a2551750f4c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Wed, 28 Jul 2021 12:45:22 -0700 Subject: [PATCH 1/3] zephyr: fix Kconfig whitespace nits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add missing newlines at end of file. Signed-off-by: Martí Bolívar --- ports/zephyr/Kconfig | 2 +- ports/zephyr/ncs/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig index 7abde6d49..bb7c7e4cc 100644 --- a/ports/zephyr/Kconfig +++ b/ports/zephyr/Kconfig @@ -260,4 +260,4 @@ config MEMFAULT_SOFTWARE_WATCHDOG_TIMEOUT_SECS rsource "ncs/Kconfig" -endif # MEMFAULT \ No newline at end of file +endif # MEMFAULT diff --git a/ports/zephyr/ncs/Kconfig b/ports/zephyr/ncs/Kconfig index 7df73e852..4a8c4501d 100644 --- a/ports/zephyr/ncs/Kconfig +++ b/ports/zephyr/ncs/Kconfig @@ -44,4 +44,4 @@ config MEMFAULT_FOTA_DOWNLOAD_CALLBACK_CUSTOM endif # MEMFAULT_FOTA -endif # MEMFAULT_NRF_CONNECT_SDK \ No newline at end of file +endif # MEMFAULT_NRF_CONNECT_SDK From ae19013d73c40033b4f0ad3eb3d48469aeb53138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Wed, 28 Jul 2021 12:46:46 -0700 Subject: [PATCH 2/3] zephyr: rework non-secure TF-M related dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zephyr recently renamed various non-secure-related Kconfig symbols: https://github.com/zephyrproject-rtos/zephyr/pull/36780 This breaks the memfault SDK defaults which are relying on the old symbol names. Resolve this by reworking the usages to just look at the SoC and whether or not the non-secure image is being built, rather than keying off of individual development boards provided by Nordic. This introduces behavioral differences for other boards based off the same SoC, but it seems more user friendly to have custom boards use the same defaults as the dev boards, to ease porting and minimize surprises. Signed-off-by: Martí Bolívar --- ports/zephyr/Kconfig | 4 ++-- ports/zephyr/ncs/Kconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig index bb7c7e4cc..6f2d0204c 100644 --- a/ports/zephyr/Kconfig +++ b/ports/zephyr/Kconfig @@ -76,7 +76,7 @@ config MEMFAULT_SHELL config MEMFAULT_HTTP_ENABLE bool "Enables support for using Memfault's HTTP APIs" - default y if BOARD_NRF9160DK_NRF9160NS || BOARD_THINGY91_NRF9160NS + default y if SOC_SERIES_NRF91X && TRUSTED_EXECUTION_NONSECURE help Enables support for querying the Memfault API for OTA updates and posting Memfault chunks @@ -103,7 +103,7 @@ endif # MEMFAULT_LOGGING_ENABLE choice bool "Implementation used to store Memfault Root certificates" - default MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM if BOARD_NRF9160DK_NRF9160NS || BOARD_THINGY91_NRF9160NS + default MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM if SOC_SERIES_NRF91X && TRUSTED_EXECUTION_NONSECURE default MEMFAULT_ROOT_CERT_STORAGE_TLS_CREDENTIAL_STORAGE config MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM diff --git a/ports/zephyr/ncs/Kconfig b/ports/zephyr/ncs/Kconfig index 4a8c4501d..46a70445e 100644 --- a/ports/zephyr/ncs/Kconfig +++ b/ports/zephyr/ncs/Kconfig @@ -1,6 +1,6 @@ config MEMFAULT_NRF_CONNECT_SDK bool "nRF Connect SDK extensions" - default y if BOARD_NRF9160DK_NRF9160NS || BOARD_THINGY91_NRF9160NS + default y if SOC_SERIES_NRF91X && TRUSTED_EXECUTION_NONSECURE select MEMFAULT_REBOOT_REASON_GET_CUSTOM if MEMFAULT_NRF_CONNECT_SDK From f70edd58ac24ca7b95269e0ca93409209ebbf197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Thu, 29 Jul 2021 12:59:31 -0700 Subject: [PATCH 3/3] examples: ncs: fix stale board name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old board name for the nRF9160DK's non-secure configuration is now deprecated. Update the docs. Signed-off-by: Martí Bolívar --- examples/nrf-connect-sdk/nrf9160/memfault_demo_app/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/README.md b/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/README.md index 82475f6cc..67ad4c54d 100644 --- a/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/README.md +++ b/examples/nrf-connect-sdk/nrf9160/memfault_demo_app/README.md @@ -19,11 +19,14 @@ targetting the nRF52 PDK would look like: ```bash $ west init -l memfault_demo_app $ west update -$ west build -b nrf9160dk_nrf9160ns memfault_demo_app +$ west build -b nrf9160dk_nrf9160_ns memfault_demo_app ... [181/181] Linking C executable zephyr/zephyr.elf ``` +Note that you will need to use `nrf9160dk_nrf9160ns` instead on +versions of NCS based on Zephyr 2.6 and earlier. + ## Testing the Integration Commands to test the integration are exposed under the `mflt` submenu in the CLI