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 #11966 from hugueskamba/hk-remove-json-duplicate-keys 

Fix targets.json syntax errors
pull/11984/head
Martin Kojtal 2019-11-29 09:45:31 +01:00 committed by GitHub
parent 733f5e25c8 444c0893e4
commit b4a885d8b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
targets/targets.json
View File

@ -2029,13 +2029,11 @@
],
"overrides": {
"tickless-from-us-ticker": true,
"init-us-ticker-at-boot": true
"init-us-ticker-at-boot": true,
"network-default-interface-type": "ETHERNET"
},
"device_name": "LPC54628J512ET180",
"post_binary_hook": { "function": "LPCTargetCode.lpc_patch" },
"overrides": {
"network-default-interface-type": "ETHERNET"
}
"post_binary_hook": { "function": "LPCTargetCode.lpc_patch" }
},
"LPC546XX": {
"supported_form_factors": ["ARDUINO"],
@ -7533,11 +7531,9 @@
"inherits": ["MCU_NRF52832"],
"release_versions": ["5"],
"device_name": "nRF52832_xxAA",
"macros_add": [
"WSF_MAX_HANDLERS=10"
],
"device_has_remove": ["ITM"],
"macros_add": [
"WSF_MAX_HANDLERS=10",
"CONFIG_GPIO_AS_PINRESET",
"NRF52_PAN_12",
"NRF52_PAN_15",