Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework non secure detection #14

Closed
wants to merge 3 commits into from
Closed

Rework non secure detection #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35d087e
zephyr: fix Kconfig whitespace nits
mbolivar-nordic Jul 28, 2021
ae19013
zephyr: rework non-secure TF-M related dependencies
mbolivar-nordic Jul 28, 2021
f70edd5
examples: ncs: fix stale board name
mbolivar-nordic Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion examples/nrf-connect-sdk/nrf9160/memfault_demo_app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ports/zephyr/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only problem here is if we decide to have new nRF91 board variants for which we do not want to enable the MemFault API. If this won't be the case (and we know that) then the change here is good. If we are not sure we should revert to listing the board Kconfigs instead.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I'm doing this on purpose for consistency across boards. If an individual board wants to override the default, it can do that in board_defconfig or Kconfig.defconfig files.

help
Enables support for querying the Memfault API for OTA updates
and posting Memfault chunks
Expand All @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment here.

default MEMFAULT_ROOT_CERT_STORAGE_TLS_CREDENTIAL_STORAGE

config MEMFAULT_ROOT_CERT_STORAGE_NRF9160_MODEM
Expand Down Expand Up @@ -260,4 +260,4 @@ config MEMFAULT_SOFTWARE_WATCHDOG_TIMEOUT_SECS

rsource "ncs/Kconfig"

endif # MEMFAULT
endif # MEMFAULT
4 changes: 2 additions & 2 deletions ports/zephyr/ncs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -44,4 +44,4 @@ config MEMFAULT_FOTA_DOWNLOAD_CALLBACK_CUSTOM

endif # MEMFAULT_FOTA

endif # MEMFAULT_NRF_CONNECT_SDK
endif # MEMFAULT_NRF_CONNECT_SDK