From 38c68e0a45bbc7347f49958b8df90adbc879d54c Mon Sep 17 00:00:00 2001 From: RFulchiero Date: Fri, 21 Sep 2018 17:49:10 -0500 Subject: [PATCH] Updates for IOTDEV-1575 and nRF52_DK builds - 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 --- .../device/TOOLCHAIN_ARM_STD/nRF52832.sct | 6 +++--- .../device/TOOLCHAIN_GCC_ARM/NRF52832.ld | 4 ++-- targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct index 06d9dbddc2..069c784ad4 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct @@ -14,7 +14,7 @@ /* If softdevice is present, set aside space for it */ #if !defined(MBED_RAM_START) #if defined(SOFTDEVICE_PRESENT) - #define MBED_RAM_START 0x200031D0 + #define MBED_RAM_START 0x20001D70 #define MBED_RAM_SIZE 0xCE30 #else #define MBED_RAM_START 0x20000000 @@ -27,8 +27,8 @@ #define MBED_RAM1_START (MBED_RAM_START + MBED_RAM0_SIZE) #define MBED_RAM1_SIZE (MBED_RAM_SIZE - MBED_RAM0_SIZE) -LR_IROM1 MBED_APP_START MBED_APP_SIZE { - ER_IROM1 MBED_APP_START MBED_APP_SIZE { +LR_IROM1 0x26000 MBED_APP_SIZE { + ER_IROM1 0x26000 MBED_APP_SIZE { *.o (RESET, +First) *(InRoot$$Sections) .ANY (+RO) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_GCC_ARM/NRF52832.ld b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_GCC_ARM/NRF52832.ld index fba4b46f7d..67a25fe5f5 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_GCC_ARM/NRF52832.ld +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_GCC_ARM/NRF52832.ld @@ -28,7 +28,7 @@ /* If softdevice is present, set aside space for it */ #if !defined(MBED_RAM_START) #if defined(SOFTDEVICE_PRESENT) - #define MBED_RAM_START 0x200031D0 + #define MBED_RAM_START 0x20001D70 #define MBED_RAM_SIZE 0xCE30 #else #define MBED_RAM_START 0x20000000 @@ -47,7 +47,7 @@ MEMORY { - FLASH (rx) : ORIGIN = MBED_APP_START, LENGTH = MBED_APP_SIZE + FLASH (rx) : ORIGIN = 0x26000, LENGTH = MBED_APP_SIZE RAM_NVIC (rwx) : ORIGIN = MBED_RAM0_START, LENGTH = MBED_RAM0_SIZE RAM (rwx) : ORIGIN = MBED_RAM1_START, LENGTH = MBED_RAM1_SIZE } diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c b/targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c index 9a8b8cb5e9..f6cdc050bf 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c @@ -41,13 +41,13 @@ #include "us_ticker_api.h" #include "nrf_timer.h" #include "app_util_platform.h" -#include "nrf_drv_common.h" +#include "nrfx_common.h" #include "mbed_critical.h" #include "nrfx_glue.h" bool us_ticker_initialized = false; -/* us ticker is driven by 1MHz clock and counter length is 16 bits. */ +/* us ticker is driven by 1MHz clock and counter length is 32 bits for nRF52 */ const ticker_info_t* us_ticker_get_info() { static const ticker_info_t info = {