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

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
pull/10652/head
RFulchiero 2018-09-21 17:49:10 -05:00 committed by desmond.chen
parent 8123b5128d
commit 38c68e0a45
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_ARM_STD/nRF52832.sct
View File

@ -14,7 +14,7 @@
/* If softdevice is present, set aside space for it */ /* If softdevice is present, set aside space for it */
#if !defined(MBED_RAM_START) #if !defined(MBED_RAM_START)
#if defined(SOFTDEVICE_PRESENT) #if defined(SOFTDEVICE_PRESENT)
#define MBED_RAM_START 0x200031D0 #define MBED_RAM_START 0x20001D70
#define MBED_RAM_SIZE 0xCE30 #define MBED_RAM_SIZE 0xCE30
#else #else
#define MBED_RAM_START 0x20000000 #define MBED_RAM_START 0x20000000
@ -27,8 +27,8 @@
#define MBED_RAM1_START (MBED_RAM_START + MBED_RAM0_SIZE) #define MBED_RAM1_START (MBED_RAM_START + MBED_RAM0_SIZE)
#define MBED_RAM1_SIZE (MBED_RAM_SIZE - MBED_RAM0_SIZE) #define MBED_RAM1_SIZE (MBED_RAM_SIZE - MBED_RAM0_SIZE)
LR_IROM1 MBED_APP_START MBED_APP_SIZE { LR_IROM1 0x26000 MBED_APP_SIZE {
ER_IROM1 MBED_APP_START MBED_APP_SIZE { ER_IROM1 0x26000 MBED_APP_SIZE {
*.o (RESET, +First) *.o (RESET, +First)
*(InRoot$$Sections) *(InRoot$$Sections)
.ANY (+RO) .ANY (+RO)

4
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/TOOLCHAIN_GCC_ARM/NRF52832.ld
View File

@ -28,7 +28,7 @@
/* If softdevice is present, set aside space for it */ /* If softdevice is present, set aside space for it */
#if !defined(MBED_RAM_START) #if !defined(MBED_RAM_START)
#if defined(SOFTDEVICE_PRESENT) #if defined(SOFTDEVICE_PRESENT)
#define MBED_RAM_START 0x200031D0 #define MBED_RAM_START 0x20001D70
#define MBED_RAM_SIZE 0xCE30 #define MBED_RAM_SIZE 0xCE30
#else #else
#define MBED_RAM_START 0x20000000 #define MBED_RAM_START 0x20000000
@ -47,7 +47,7 @@
MEMORY 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_NVIC (rwx) : ORIGIN = MBED_RAM0_START, LENGTH = MBED_RAM0_SIZE
RAM (rwx) : ORIGIN = MBED_RAM1_START, LENGTH = MBED_RAM1_SIZE RAM (rwx) : ORIGIN = MBED_RAM1_START, LENGTH = MBED_RAM1_SIZE
} }

4
targets/TARGET_NORDIC/TARGET_NRF5x/us_ticker.c
View File

@ -41,13 +41,13 @@
#include "us_ticker_api.h" #include "us_ticker_api.h"
#include "nrf_timer.h" #include "nrf_timer.h"
#include "app_util_platform.h" #include "app_util_platform.h"
#include "nrf_drv_common.h" #include "nrfx_common.h"
#include "mbed_critical.h" #include "mbed_critical.h"
#include "nrfx_glue.h" #include "nrfx_glue.h"
bool us_ticker_initialized = false; 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() const ticker_info_t* us_ticker_get_info()
{ {
static const ticker_info_t info = { static const ticker_info_t info = {