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 #11995 from VeijoPesonen/mcu_nrf52840_fixes 

MCU_NRF52840 target configuration fixes
pull/12010/head
Martin Kojtal 2019-12-03 09:03:43 +01:00 committed by GitHub
parent da5a8b2b65 5d3e859d1c
commit fc488f6f36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
targets/targets.json
View File

@ -7831,6 +7831,8 @@
"overrides": { "overrides": {
"mpu-rom-end": "0x1fffffff" "mpu-rom-end": "0x1fffffff"
}, },
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"OUTPUT_EXT": "hex", "OUTPUT_EXT": "hex",
"is_disk_virtual": true, "is_disk_virtual": true,
"supported_toolchains": ["GCC_ARM", "ARM", "IAR"], "supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
@ -7842,29 +7844,22 @@
"NRF52840_DK": { "NRF52840_DK": {
"supported_form_factors": ["ARDUINO"], "supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52840"], "inherits": ["MCU_NRF52840"],
"release_versions": ["5"], "detect_code": ["1102"],
"device_name": "nRF52840_xxAA",
"macros_add": [ "macros_add": [
"CONFIG_GPIO_AS_PINRESET" "CONFIG_GPIO_AS_PINRESET"
] ]
}, },
"ARDUINO_NANO33BLE": { "ARDUINO_NANO33BLE": {
"inherits": ["MCU_NRF52840"], "inherits": ["MCU_NRF52840"],
"release_versions": ["5"], "features_add": ["STORAGE"],
"device_name": "nRF52840_xxAA",
"features_add": ["BLE", "STORAGE"],
"components_remove": ["QSPIF"], "components_remove": ["QSPIF"],
"components_add": ["FLASHIAP"],
"device_has_remove": ["QSPI", "ITM"], "device_has_remove": ["QSPI", "ITM"],
"device_has_add": ["FLASH"],
"macros_add": [ "macros_add": [
"CONFIG_GPIO_AS_PINRESET" "CONFIG_GPIO_AS_PINRESET"
] ]
}, },
"MTB_LAIRD_BL654": { "MTB_LAIRD_BL654": {
"inherits": ["MCU_NRF52840"], "inherits": ["MCU_NRF52840"],
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"detect_code": ["0465"], "detect_code": ["0465"],
"features_remove": ["CRYPTOCELL310"], "features_remove": ["CRYPTOCELL310"],
"macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"], "macros_remove": ["MBEDTLS_CONFIG_HW_SUPPORT"],
@ -7876,13 +7871,10 @@
}, },
"MAKERDIARY_NRF52840_MDK": { "MAKERDIARY_NRF52840_MDK": {
"inherits": ["MCU_NRF52840"], "inherits": ["MCU_NRF52840"],
"release_versions": ["5"],
"device_name": "nRF52840_xxAA",
"detect_code": ["1026"], "detect_code": ["1026"],
"device_has_remove": ["ITM"], "device_has_remove": ["ITM"],
"macros_add": [ "macros_add": [
"CONFIG_GPIO_AS_PINRESET", "CONFIG_GPIO_AS_PINRESET"
"NRF52_ERRATA_20"
] ]
}, },
"BLUEPILL_F103C8": { "BLUEPILL_F103C8": {
@ -9634,7 +9626,6 @@
}, },
"EP_AGORA": { "EP_AGORA": {
"inherits": ["MCU_NRF52840"], "inherits": ["MCU_NRF52840"],
"device_name": "nRF52840_xxAA",
"supported_form_factors": [], "supported_form_factors": [],
"config": { "config": {
"modem_is_on_board": { "modem_is_on_board": {
@ -9650,7 +9641,6 @@
}, },
"components_add": ["SPIF"], "components_add": ["SPIF"],
"components_remove": ["QSPIF"], "components_remove": ["QSPIF"],
"release_versions": ["5"],
"macros_add": [ "macros_add": [
"CONFIG_GPIO_AS_PINRESET" "CONFIG_GPIO_AS_PINRESET"
] ]