ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup for feature release 

* Update TARGET_NRF5x/README.md to improve "Changing SoftDevice" section
  and added section on NRF52840 CryptoCell310 Support
* Update the file list in TARGET_SDK_15_0/TARGET_SOFTDEVICE_COMMON/README.md
* Add missing CR-LF to Nordic-provided SDK file
* Rename a header file in the TARGET_SOFTDEVICE_S112 tree
pull/10652/head
RFulchiero 2018-11-15 13:03:49 -06:00 committed by desmond.chen
parent 2a968d4d35
commit 74cb69873c
5 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
targets/TARGET_NORDIC/TARGET_NRF5x/README.md
View File

@ -180,41 +180,54 @@ SoftDevices are treated as bootloaders and automatically combined by the tools.
NRF52832 uses the S132 SoftDevice and NRF52840 uses the S140 SoftDevice. NRF52832 uses the S132 SoftDevice and NRF52840 uses the S140 SoftDevice.
The X_OTA and X_MBR binaries are obtained from the original X_FULL SoftDevice by splitting it in an MBR part and a SoftDevice part. The MBR is needed for the bootloader and the SoftDevice for firmware updates. The OTA and MBR binaries are obtained from the original FULL SoftDevice by splitting it in an MBR part and a SoftDevice part. The MBR is needed for the bootloader and the SoftDevice for firmware updates.
### Changing SoftDevice ### Changing SoftDevice
By default, all applications are built with the FULL SoftDevice. This can be changed by modifying the application's `mbed_app.json` configuration file. By default, all applications are built with the FULL SoftDevice. This can be changed by modifying the application's `mbed_app.json` configuration file. Examples for the NRF52_DK and NRF52840_DK boards are shown below.
Build application without SoftDevice: Build application with no MBR or SoftDevice:
``` ```
"target_overrides": { "target_overrides": {
"*": { "NRF52_DK": {
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_X_FULL"], "target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL"],
"target.extra_labels_add": ["SOFTDEVICE_NONE"]
},
"NRF52840_DK": {
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S140_FULL"],
"target.extra_labels_add": ["SOFTDEVICE_NONE"] "target.extra_labels_add": ["SOFTDEVICE_NONE"]
} }
} }
``` ```
Build application for firmware update using SoftDevice X:
Build application with MBR only:
``` ```
"target_overrides": { "target_overrides": {
"*": { "NRF52_DK": {
"target.extra_labels_remove": ["SOFTDEVICE_X_FULL"], "target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_S132_FULL"],
"target.extra_labels_add": ["SOFTDEVICE_X_OTA"] "target.extra_labels_add": ["SOFTDEVICE_S132_MBR"]
},
"NRF52840_DK": {
"target.extra_labels_remove": ["SOFTDEVICE_S140_FULL"],
"target.extra_labels_add": ["SOFTDEVICE_S140_MBR"]
} }
} }
``` ```
Build bootloader without SoftDevice X: ## NRF52840 CryptoCell310 Support
By default, all NRF52840 applications will use the CryptoCell310 subsystem which is built into the NRF52840. This provides hardware support for random number generation and encryption which are utilized by Mbed TLS. If using the CryptoCell310 subsystem is not desired, it can be replaced with a software implementation. This can be done by modifying the application's `mbed_app.json` configuration file as shown below.
``` ```
"target_overrides": { "target_overrides": {
"*": { "NRF52840_DK": {
"target.extra_labels_remove": ["SOFTDEVICE_COMMON", "SOFTDEVICE_X_FULL"], "target.features_remove": ["CRYPTOCELL310"],
"target.extra_labels_add": ["SOFTDEVICE_X_MBR"] "target.macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
"target.macros_add": ["NRFX_RNG_ENABLED=1", "RNG_ENABLED=1", "NRF_QUEUE_ENABLED=1"]
} }
} }
``` ```

9
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_COMMON/README.md
View File

@ -7,14 +7,17 @@ components/softdevice
Removed: Removed:
* common/nrf_sdh_freertos.c * common/nrf_sdh_freertos.c
* common/nrf_sdh_freertos.h * common/nrf_sdh_freertos.h
* s212/* * s112/toolchain
* s132/toolchain
* s212/
Moved: Moved:
* common/ to ../modules/softdevice/common
* mbr/nrf52832/ to ../TARGET_SOFTDEVICE_S132_MBR * mbr/nrf52832/ to ../TARGET_SOFTDEVICE_S132_MBR
* mbr/nrf52840/ to ../TARGET_SOFTDEVICE_S140_MBR * mbr/nrf52840/ to ../TARGET_SOFTDEVICE_S140_MBR
* s112/ to ../TARGET_SOFTDEVICE_S112 * s112/ to ../TARGET_SOFTDEVICE_S112
* s132/ to ../TARGET_SOFTDEVICE_S132 * s132/ to ../TARGET_SOFTDEVICE_S132_FULL
* s140/ to ../TARGET_SOFTDEVICE_S140 * s140/ to ../TARGET_SOFTDEVICE_S140_FULL
Renamed: Renamed:
* ble.h to nrf_ble.h * ble.h to nrf_ble.h

0
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S112/headers/ble.h → targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/TARGET_SOFTDEVICE_S112/headers/nrf_ble.h
View File

1
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/components/libraries/README.md
View File

@ -19,7 +19,6 @@ Removed:
* csense/ * csense/
* csense_drv/ * csense_drv/
* ecc/ * ecc/
* eddystone/
* experimental_libuarte/ * experimental_libuarte/
* experimental_mpu/ * experimental_mpu/
* experimental_ringbuf/ * experimental_ringbuf/