Update the Nordic nRF52 SDK 15 feature branch #10441

j3hill · 2019-04-18T16:24:15Z

Description

Update the Nordic nRF52 SDK 15 feature branch to merge the latest QSPI functionality and other updates into Mbed-OS Master.

Pull request type

[ ] Fix
[ ] Refactor
[x] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

…feature defines

- top level files ported from TARGET_NORDIC/TARGET_NRF5x/ Also addressed: - fixed linking issue for gcc - added support for nRF52-DK builds, but reverted to using nRF52840 sdk_config.h (must be updated) - introduced "RTC" to targets.json (might need to be removed eventually)

Also addressed: - removed dependency on legacy config (excluded apply_old_config.h) - removed legacy pwm and saadc headers - Arm Compiler 5 linking issue (a band-aid for now... needs to be properly addressed for peripheral sharing) - added missing header in SoftDevice file

- Missed some NRFX defines that needed to changed - Set PWM base clock to 125kHz (needs to be reverted back to 1 MHz) - Updated sdk_config.h for nRF52_DK builds - Brought in updates from PR7779 (fix for nRF52 PWM issues)

Enable UART interfaces to enable serial debug prints.

Using the nrfx_get_irq_number only works with the handle. Since we know the IRQ numbers for UART0, RTC2 and EGU0, use them directly.

- Use new NRFX header file - Fix nRF52832 linker script/ld files (hardcoded addresses for now) - Temporarily remove DEVICE_TRNG for nRF52832 (which broke the build) - Improve serial_putc() fix so we don't rely on "extra" functions

- Added legacy nrf_drv_rng.c as there is no merit in fully adopting nrfx_rng.c - Added nrf_queue library component - Removed apply_old_config.h (unused for some time now) - Updated sdk_config.h for queue and RNG support for nRF52832 - Brought back RNG into targets.json for nRF52832 Note: nRF52840 still uses CryptoCell 310 for TRNG

When the SoftDevice (SD) is enabled we need to set the app_offset to 0x26000 to make room for the SoftDevice. If we let the build tools self-manage this, MBED_APP_START is coming out at 0x25000 which is not correct for the Nordic 15.0 SDK. The app_offset value is translated to MBED_APP_START by the build infrastructure. We were hard coding MBED_APP_START in the scatter and ld files as a temporary measure while testing. This now sets it properly if the SD is being brought in.

Ensure that vector table gets initialized properly. The table that we initialize in startup_nrf52840.S gets wiped out as the section is declared as noinit. Fix this by implementing the weak function mbed_sdk_init that inits the vector table.

* Remove NRF_SDH_CLOCK parameters from mbed_lib.json * Bring in QSPI for nRF52840 * Migrate legacy QSPI driver to SDK v15 (nrfx_qspi.h) * Remove outdated comment in i2c_api.c

The 15.0 SDK doesn't support the nRF51 so it must continue to use the legacy NRF drivers. Thus the original common_rtc.c, gpio_api.c and us_ticker.c are restored and placed under TARGET_NRF5x/TARGET_NRF51. Likewise the modified common_rtc.c, gpio_api.c and us_ticker.c are moved to TARGET_NRF5x/TARGET_NRF52 so they are excluded from nRF51 builds.

nRF5x PinNames.h never utilized PORT_SHIFT so removed for clarity after user commented on it.

- Add MBR, NONE and OTA SoftDevice build options for S132 and S140 - Add S112 SoftDevice (single build option) - Some folder restructuring in TARGET_SOFTDEVICE_COMMON was required

This reverts commit 3d2fa53. This was a breaking change for the "MBR" and "NONE" builds. After testing it was also determined that copying the vector table a second time wasn't required for the "FULL" build.

* 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

- Brought in new nrfx APIs - Brought in PPI additions - Removed dead code for RTC

j3hill · 2019-04-24T16:05:49Z

Thanks to everyone who has taken the time to review this (large) PR to update the Nordic nRF5x target to SDK 15. It is important to note that this PR will replace the Nordic Softdevice (from SDK 14.2) with the Cordio BLE stack. Once this PR is merged, the Mbed-OS will no longer support the Nordic Softdevice. Developers who want to use the Nordic Softdevice (from SDK 14.2) will need to use a previous version of Mbed-OS.

0Grit · 2019-04-24T19:26:05Z

So the Cordio stack will continue to receive first class support in Mbed then?

pan- · 2019-04-25T15:06:13Z

Once this PR is merged, the Mbed-OS will no longer support the Nordic Softdevice.

@donatieng Was it planned that way ? I'm confused to say the least as I though soft device and cordio would be both supported at the current time.

donatieng · 2019-04-25T15:26:29Z

We'll need #10272 to go on top of that work first to avoid having an un-tested/unsupported configuration on master (Cordio 18.02 LL + SDK15).
What we've tested:

Cordio 18.02 LL + nRF SDK 14.2
Cordio 19.02 LL + nRF SDK 15

What I suggest:

Replace the feature-nrf52-sdk15 feature branch with this PR's content (which is a rebase)
Rebase and merge BLE: update Cordio link layer to 19.2 #10272 on top of that
Bring the whole thing to master

Also,

Once this PR is merged, the Mbed-OS will no longer support the Nordic Softdevice.

@j3hill Could you confirm this is not the case (current situation is we support both)?
We still need support for both at this stage.

donatieng · 2019-04-25T15:33:16Z

@loverdeg-ep

So the Cordio stack will continue to receive first class support in Mbed then?

We have no plans to change how we deliver Cordio within Mbed OS.

j3hill · 2019-04-25T15:37:58Z

I'm adding @desmond-blue to this thread. As you can see in the work he has done for this PR, he certainly provides first class support for the Mbed-OS Cordio BLE stack (and much more). @donatieng Yes. I have confirmed that it is not possible to select the SDK 15 Softdevice with the the changes completed for this PR. It would be possible in a future PR to add support for the SDK 15 Softdevice back into Mbed OS, but it is not part of this (already significant amount of) work.

adbridge · 2019-04-26T14:26:11Z

ci started

adbridge · 2019-04-26T14:45:13Z

At @donatieng 's request, the feature branch has been reset to current master and then this PR retargeted there.

donatieng · 2019-04-26T17:40:27Z

Thanks @adbridge !

mbed-ci · 2019-04-26T18:22:35Z

Test run: FAILED

Summary: 1 of 11 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_cloud-client-test

alekla01 · 2019-04-29T10:07:07Z

Restarted cloud-client-test

maclobdell · 2019-05-09T17:54:02Z

Any update on this one? We have partners/customers anxiously awaiting this.

pan- · 2019-05-10T09:34:59Z

@maclobdell Softdevice support is being reintroduced.

paul-szczepanek-arm · 2019-05-13T12:30:35Z

I am working to get the link layer needed by the SDK 15 merged into the feature branch prior to it being merged into master.

paul-szczepanek-arm · 2019-05-14T14:45:09Z

depends on #10542

edablan · 2019-06-10T20:09:07Z

@pan-
Any word on how long softdevice support will continue for newer version of mbedOS? The comment above makes it seem its being reintroduced for newer upcoming versions of mbedOS, but not sure for how long. When will the Cordio Stack be fully implemented with SDK15? I ask because we have a product that is in its final stages. Not sure if we will have time to quickly port to Cordio by then.

pan- · 2019-06-11T10:59:13Z

@edablan One month later I can announce that mbed-os 5.13 will just support the Cordio stack and uses SDK15. There's no plans (yet) to reintroduce the softdevice - I know it contradicts with my previous statement.
Cordio or SoftDevice are just implementation details; there's a single API for BLE that is supposed to work on multiple stacks. Please don't hesitate to report issues if you have any.

TacoGrandeTX and others added 30 commits April 18, 2019 11:01

Baseline legacy build using 14.2 drivers.

64a1f04

Mods for baseline 15.0 support

0a46ae1

Bringing in Softdevice but excluding BLE feature and improvements in …

2e7f7da

…feature defines

Updates to PWM for IOTDEV-1573

61b3f21

- Missed some NRFX defines that needed to changed - Set PWM base clock to 125kHz (needs to be reverted back to 1 MHz) - Updated sdk_config.h for nRF52_DK builds - Brought in updates from PR7779 (fix for nRF52 PWM issues)

serial_api: Fixes to compile with SDK15.0

331f2de

serial_api: add changes to port from Softdevice 14.2 to 15.0

96b9e29

Nordic sdk_config: Configure UART instances

5ce7ac3

Enable UART interfaces to enable serial debug prints.

serial_api: Fix the interrupt registration for Nordic Serial Device

fa616c7

Using the nrfx_get_irq_number only works with the handle. Since we know the IRQ numbers for UART0, RTC2 and EGU0, use them directly.

Updates for IOTDEV-1575 and nRF52_DK builds

351c993

- Use new NRFX header file - Fix nRF52832 linker script/ld files (hardcoded addresses for now) - Temporarily remove DEVICE_TRNG for nRF52832 (which broke the build) - Improve serial_putc() fix so we don't rely on "extra" functions

NRF52: spi_api: port from Softdevice 14.2 to 15.0

577d7f7

NRF52: i2c_api: port from Softdevice 14.2 to 15.0

9b3cafe

NRF: enable PRS (Peripheral Resource Sharing) for NRF52832 and NRF52840

01ad7ed

NRF52832: enable UART

3ed6022

nRF52832 needs NRFX_RNG_ENABLED to use the legacy driver

72127f7

NRF52: Fix vector table

92a24c4

Ensure that vector table gets initialized properly. The table that we initialize in startup_nrf52840.S gets wiped out as the section is declared as noinit. Fix this by implementing the weak function mbed_sdk_init that inits the vector table.

Updates after rebase with Mbed master (circa OS v5.10.1)

132ce06

* Remove NRF_SDH_CLOCK parameters from mbed_lib.json * Bring in QSPI for nRF52840 * Migrate legacy QSPI driver to SDK v15 (nrfx_qspi.h) * Remove outdated comment in i2c_api.c

Remove dead #define PORT_SHIFT

b04e687

nRF5x PinNames.h never utilized PORT_SHIFT so removed for clarity after user commented on it.

Add missing SoftDevice build support (MBR, NONE, OTA)

dcccf9a

- Add MBR, NONE and OTA SoftDevice build options for S132 and S140 - Add S112 SoftDevice (single build option) - Some folder restructuring in TARGET_SOFTDEVICE_COMMON was required

Revert "NRF52: Fix vector table"

ac960d2

This reverts commit 3d2fa53. This was a breaking change for the "MBR" and "NONE" builds. After testing it was also determined that copying the vector table a second time wasn't required for the "FULL" build.

Enabling NRFX_PPI_ENABLED for serial_api updates

318a1e3

Changes required for rebase:

f540be8

- Brought in new nrfx APIs - Brought in PPI additions - Removed dead code for RTC

Set the PWM clock prescaler back to default (1MHz clock)

1789053

NRF52: serial: fix build warnings

b24c636

NRF52: Cleanup unused code

b1ec3f6

c1728p9 approved these changes Apr 23, 2019

View reviewed changes

AGlass0fMilk mentioned this pull request Apr 23, 2019

nRF52840 USBPhy Implementation #10457

Closed

j3hill requested a review from paul-szczepanek-arm April 23, 2019 16:42

bulislaw approved these changes Apr 24, 2019

View reviewed changes

adbridge changed the base branch from master to feature-nrf52-sdk15 April 26, 2019 14:22

adbridge changed the title ~~Update the Nordic nRF52 SDK 15 feature branch to merge into Mbed-OS master~~ Update the Nordic nRF52 SDK 15 feature branch Apr 26, 2019

adbridge added needs: CI and removed needs: review labels Apr 26, 2019

adbridge added ready for merge release-version: feature branch and removed needs: CI labels Apr 29, 2019

0xc0170 merged commit a975a26 into ARMmbed:feature-nrf52-sdk15 Apr 29, 2019

adbridge removed the ready for merge label May 1, 2019

Update the Nordic nRF52 SDK 15 feature branch #10441

Update the Nordic nRF52 SDK 15 feature branch #10441

Uh oh!

Conversation

j3hill commented Apr 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull request type

Uh oh!

j3hill commented Apr 24, 2019

Uh oh!

0Grit commented Apr 24, 2019

Uh oh!

pan- commented Apr 25, 2019

Uh oh!

donatieng commented Apr 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

donatieng commented Apr 25, 2019

Uh oh!

j3hill commented Apr 25, 2019

Uh oh!

adbridge commented Apr 26, 2019

Uh oh!

adbridge commented Apr 26, 2019

Uh oh!

donatieng commented Apr 26, 2019

Uh oh!

mbed-ci commented Apr 26, 2019

Test run: FAILED

Uh oh!

alekla01 commented Apr 29, 2019

Uh oh!

maclobdell commented May 9, 2019

Uh oh!

pan- commented May 10, 2019

Uh oh!

paul-szczepanek-arm commented May 13, 2019

Uh oh!

paul-szczepanek-arm commented May 14, 2019

Uh oh!

edablan commented Jun 10, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pan- commented Jun 11, 2019

Uh oh!

Uh oh!

j3hill commented Apr 18, 2019 •

edited

Loading

donatieng commented Apr 25, 2019 •

edited

Loading

edablan commented Jun 10, 2019 •

edited

Loading