Skip to content

Commit b4a885d

Browse files
authored
Merge pull request #11966 from hugueskamba/hk-remove-json-duplicate-keys
Fix targets.json syntax errors
2 parents 733f5e2 + 444c089 commit b4a885d

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

targets/targets.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,13 +2029,11 @@
20292029
],
20302030
"overrides": {
20312031
"tickless-from-us-ticker": true,
2032-
"init-us-ticker-at-boot": true
2032+
"init-us-ticker-at-boot": true,
2033+
"network-default-interface-type": "ETHERNET"
20332034
},
20342035
"device_name": "LPC54628J512ET180",
2035-
"post_binary_hook": { "function": "LPCTargetCode.lpc_patch" },
2036-
"overrides": {
2037-
"network-default-interface-type": "ETHERNET"
2038-
}
2036+
"post_binary_hook": { "function": "LPCTargetCode.lpc_patch" }
20392037
},
20402038
"LPC546XX": {
20412039
"supported_form_factors": ["ARDUINO"],
@@ -7533,11 +7531,9 @@
75337531
"inherits": ["MCU_NRF52832"],
75347532
"release_versions": ["5"],
75357533
"device_name": "nRF52832_xxAA",
7536-
"macros_add": [
7537-
"WSF_MAX_HANDLERS=10"
7538-
],
75397534
"device_has_remove": ["ITM"],
75407535
"macros_add": [
7536+
"WSF_MAX_HANDLERS=10",
75417537
"CONFIG_GPIO_AS_PINRESET",
75427538
"NRF52_PAN_12",
75437539
"NRF52_PAN_15",

0 commit comments

Comments
 (0)