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 #9060 from scartmell-arm/fix-duplicate-keys-in-targets-json 

Fix duplicate 'overrides' keys in targets.json config file
pull/9109/head
Cruz Monrreal 2018-12-12 17:02:05 -06:00 committed by GitHub
parent d8be78b84b 8c541465ed
commit fda9f2ee2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -2773,7 +2773,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"],
@ -2791,6 +2790,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"
} }
}, },
@ -2820,7 +2820,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",
@ -2841,6 +2840,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"
} }
}, },
@ -2874,7 +2874,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"],
@ -2892,6 +2891,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"
} }
}, },
@ -3630,7 +3630,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": [
@ -3647,6 +3646,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"
} }
}, },
@ -3676,7 +3676,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": [
@ -3692,6 +3691,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"
} }
}, },
@ -3791,7 +3791,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.",
@ -4089,7 +4088,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",
@ -4102,6 +4100,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"
} }
}, },