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

Merge pull request #11347 from woodsking2/master 

Fix NRF52832 softdevice memory map
pull/11541/head
Martin Kojtal 2019-09-20 14:09:42 +02:00 committed by GitHub
parent d0b5ba6d84 876b643a9d
commit 6790e64bd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/targets.json
View File

@ -7342,7 +7342,6 @@
"MCU_NRF52832": { "MCU_NRF52832": {
"inherits": ["Target"], "inherits": ["Target"],
"core": "Cortex-M4F", "core": "Cortex-M4F",
"static_memory_defines": false,
"macros": [ "macros": [
"BOARD_PCA10040", "BOARD_PCA10040",
"NRF52", "NRF52",
@ -7644,7 +7643,6 @@
"inherits": ["Target"], "inherits": ["Target"],
"components_add": ["QSPIF"], "components_add": ["QSPIF"],
"core": "Cortex-M4F", "core": "Cortex-M4F",
"static_memory_defines": false,
"macros": [ "macros": [
"BOARD_PCA10056", "BOARD_PCA10056",
"NRF52840_XXAA", "NRF52840_XXAA",