Skip to content

Commit 8c54146

Browse files
author
Steve Cartmell
committed
fix: Merge duplicate 'overrides' keys in targets.json config file
1 parent 7546186 commit 8c54146

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

targets/targets.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2773,7 +2773,6 @@
27732773
"value": 1
27742774
}
27752775
},
2776-
"overrides": { "lpticker_delay_ticks": 3 },
27772776
"macros_add": ["USBHOST_OTHER"],
27782777
"supported_form_factors": ["ARDUINO"],
27792778
"detect_code": ["0816"],
@@ -2791,6 +2790,7 @@
27912790
"device_name": "STM32F746ZG",
27922791
"bootloader_supported": true,
27932792
"overrides": {
2793+
"lpticker_delay_ticks": 3,
27942794
"network-default-interface-type": "ETHERNET"
27952795
}
27962796
},
@@ -2820,7 +2820,6 @@
28202820
"value": 1
28212821
}
28222822
},
2823-
"overrides": { "lpticker_delay_ticks": 3 },
28242823
"macros_add": [
28252824
"TRANSACTION_QUEUE_SIZE_SPI=2",
28262825
"USBHOST_OTHER",
@@ -2841,6 +2840,7 @@
28412840
"release_versions": ["2", "5"],
28422841
"device_name": "STM32F756ZG",
28432842
"overrides": {
2843+
"lpticker_delay_ticks": 3,
28442844
"network-default-interface-type": "ETHERNET"
28452845
}
28462846
},
@@ -2874,7 +2874,6 @@
28742874
"value": 1
28752875
}
28762876
},
2877-
"overrides": { "lpticker_delay_ticks": 3 },
28782877
"supported_form_factors": ["ARDUINO"],
28792878
"macros_add": ["USBHOST_OTHER"],
28802879
"detect_code": ["0818"],
@@ -2892,6 +2891,7 @@
28922891
"device_name": "STM32F767ZI",
28932892
"bootloader_supported": true,
28942893
"overrides": {
2894+
"lpticker_delay_ticks": 3,
28952895
"network-default-interface-type": "ETHERNET"
28962896
}
28972897
},
@@ -3630,7 +3630,6 @@
36303630
"value": 1
36313631
}
36323632
},
3633-
"overrides": { "lpticker_delay_ticks": 3 },
36343633
"detect_code": ["0815"],
36353634
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
36363635
"device_has_add": [
@@ -3647,6 +3646,7 @@
36473646
"device_name": "STM32F746NG",
36483647
"bootloader_supported": true,
36493648
"overrides": {
3649+
"lpticker_delay_ticks": 3,
36503650
"network-default-interface-type": "ETHERNET"
36513651
}
36523652
},
@@ -3676,7 +3676,6 @@
36763676
"value": 1
36773677
}
36783678
},
3679-
"overrides": { "lpticker_delay_ticks": 3 },
36803679
"detect_code": ["0817"],
36813680
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
36823681
"device_has_add": [
@@ -3692,6 +3691,7 @@
36923691
"release_versions": ["2", "5"],
36933692
"device_name": "STM32F769NI",
36943693
"overrides": {
3694+
"lpticker_delay_ticks": 3,
36953695
"network-default-interface-type": "ETHERNET"
36963696
}
36973697
},
@@ -3791,7 +3791,6 @@
37913791
"inherits": ["FAMILY_STM32"],
37923792
"core": "Cortex-M4F",
37933793
"extra_labels_add": ["STM32F4", "STM32F411RE"],
3794-
"device_has_add": ["MPU"],
37953794
"config": {
37963795
"modem_is_on_board": {
37973796
"help": "Value: Tells the build system that the modem is on-board as oppose to a plug-in shield/module.",
@@ -4090,7 +4089,6 @@
40904089
"GNSSBAUD=9600",
40914090
"MBED_MPU_CUSTOM"
40924091
],
4093-
"overrides": { "lse_available": 0 },
40944092
"device_has_add": [
40954093
"ANALOGOUT",
40964094
"EMAC",
@@ -4102,6 +4100,7 @@
41024100
"device_name": "STM32F437VG",
41034101
"bootloader_supported": true,
41044102
"overrides": {
4103+
"lse_available": 0,
41054104
"network-default-interface-type": "ETHERNET"
41064105
}
41074106
},

0 commit comments

Comments
 (0)