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

fix: Merge duplicate 'overrides' keys in targets.json config file

pull/9208/head
Steve Cartmell 2018-12-11 16:19:06 +00:00 committed by Cruz Monrreal II
parent 42b3427138
commit dbb97cef80
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
targets/targets.json
View File

@ -2774,7 +2774,6 @@
"value": 1 "value": 1
} }
}, },
"overrides": { "lpticker_delay_ticks": 3 },
"macros_add": ["USBHOST_OTHER"], "macros_add": ["USBHOST_OTHER"],
"supported_form_factors": ["ARDUINO"], "supported_form_factors": ["ARDUINO"],
"detect_code": ["0816"], "detect_code": ["0816"],
@ -2792,6 +2791,7 @@
"device_name": "STM32F746ZG", "device_name": "STM32F746ZG",
"bootloader_supported": true, "bootloader_supported": true,
"overrides": { "overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET" "network-default-interface-type": "ETHERNET"
} }
}, },
@ -2821,7 +2821,6 @@
"value": 1 "value": 1
} }
}, },
"overrides": { "lpticker_delay_ticks": 3 },
"macros_add": [ "macros_add": [
"TRANSACTION_QUEUE_SIZE_SPI=2", "TRANSACTION_QUEUE_SIZE_SPI=2",
"USBHOST_OTHER", "USBHOST_OTHER",
@ -2842,6 +2841,7 @@
"release_versions": ["2", "5"], "release_versions": ["2", "5"],
"device_name": "STM32F756ZG", "device_name": "STM32F756ZG",
"overrides": { "overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET" "network-default-interface-type": "ETHERNET"
} }
}, },
@ -2875,7 +2875,6 @@
"value": 1 "value": 1
} }
}, },
"overrides": { "lpticker_delay_ticks": 3 },
"supported_form_factors": ["ARDUINO"], "supported_form_factors": ["ARDUINO"],
"macros_add": ["USBHOST_OTHER"], "macros_add": ["USBHOST_OTHER"],
"detect_code": ["0818"], "detect_code": ["0818"],
@ -2893,6 +2892,7 @@
"device_name": "STM32F767ZI", "device_name": "STM32F767ZI",
"bootloader_supported": true, "bootloader_supported": true,
"overrides": { "overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET" "network-default-interface-type": "ETHERNET"
} }
}, },
@ -3631,7 +3631,6 @@
"value": 1 "value": 1
} }
}, },
"overrides": { "lpticker_delay_ticks": 3 },
"detect_code": ["0815"], "detect_code": ["0815"],
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": [ "device_has_add": [
@ -3648,6 +3647,7 @@
"device_name": "STM32F746NG", "device_name": "STM32F746NG",
"bootloader_supported": true, "bootloader_supported": true,
"overrides": { "overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET" "network-default-interface-type": "ETHERNET"
} }
}, },
@ -3677,7 +3677,6 @@
"value": 1 "value": 1
} }
}, },
"overrides": { "lpticker_delay_ticks": 3 },
"detect_code": ["0817"], "detect_code": ["0817"],
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": [ "device_has_add": [
@ -3693,6 +3692,7 @@
"release_versions": ["2", "5"], "release_versions": ["2", "5"],
"device_name": "STM32F769NI", "device_name": "STM32F769NI",
"overrides": { "overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET" "network-default-interface-type": "ETHERNET"
} }
}, },
@ -3792,7 +3792,6 @@
"inherits": ["FAMILY_STM32"], "inherits": ["FAMILY_STM32"],
"core": "Cortex-M4F", "core": "Cortex-M4F",
"extra_labels_add": ["STM32F4", "STM32F411RE"], "extra_labels_add": ["STM32F4", "STM32F411RE"],
"device_has_add": ["MPU"],
"config": { "config": {
"modem_is_on_board": { "modem_is_on_board": {
"help": "Value: Tells the build system that the modem is on-board as oppose to a plug-in shield/module.", "help": "Value: Tells the build system that the modem is on-board as oppose to a plug-in shield/module.",
@ -4090,7 +4089,6 @@
"HSE_VALUE=12000000", "HSE_VALUE=12000000",
"GNSSBAUD=9600" "GNSSBAUD=9600"
], ],
"overrides": { "lse_available": 0 },
"device_has_add": [ "device_has_add": [
"ANALOGOUT", "ANALOGOUT",
"EMAC", "EMAC",
@ -4103,6 +4101,7 @@
"device_name": "STM32F437VG", "device_name": "STM32F437VG",
"bootloader_supported": true, "bootloader_supported": true,
"overrides": { "overrides": {
"lse_available": 0,
"network-default-interface-type": "ETHERNET" "network-default-interface-type": "ETHERNET"
} }
}, },