Skip to content

Fix duplicate 'overrides' keys in targets.json config file #9060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from Dec 12, 2018
Merged

Fix duplicate 'overrides' keys in targets.json config file #9060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions targets/targets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2773,7 +2773,6 @@
"value": 1
}
},
"overrides": { "lpticker_delay_ticks": 3 },
"macros_add": ["USBHOST_OTHER"],
"supported_form_factors": ["ARDUINO"],
"detect_code": ["0816"],
Expand All @@ -2791,6 +2790,7 @@
"device_name": "STM32F746ZG",
"bootloader_supported": true,
"overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET"
}
},
Expand Down Expand Up @@ -2820,7 +2820,6 @@
"value": 1
}
},
"overrides": { "lpticker_delay_ticks": 3 },
"macros_add": [
"TRANSACTION_QUEUE_SIZE_SPI=2",
"USBHOST_OTHER",
Expand All @@ -2841,6 +2840,7 @@
"release_versions": ["2", "5"],
"device_name": "STM32F756ZG",
"overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET"
}
},
Expand Down Expand Up @@ -2874,7 +2874,6 @@
"value": 1
}
},
"overrides": { "lpticker_delay_ticks": 3 },
"supported_form_factors": ["ARDUINO"],
"macros_add": ["USBHOST_OTHER"],
"detect_code": ["0818"],
Expand All @@ -2892,6 +2891,7 @@
"device_name": "STM32F767ZI",
"bootloader_supported": true,
"overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET"
}
},
Expand Down Expand Up @@ -3630,7 +3630,6 @@
"value": 1
}
},
"overrides": { "lpticker_delay_ticks": 3 },
"detect_code": ["0815"],
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": [
Expand All @@ -3647,6 +3646,7 @@
"device_name": "STM32F746NG",
"bootloader_supported": true,
"overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET"
}
},
Expand Down Expand Up @@ -3676,7 +3676,6 @@
"value": 1
}
},
"overrides": { "lpticker_delay_ticks": 3 },
"detect_code": ["0817"],
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": [
Expand All @@ -3692,6 +3691,7 @@
"release_versions": ["2", "5"],
"device_name": "STM32F769NI",
"overrides": {
"lpticker_delay_ticks": 3,
"network-default-interface-type": "ETHERNET"
}
},
Expand Down Expand Up @@ -3791,7 +3791,6 @@
"inherits": ["FAMILY_STM32"],
"core": "Cortex-M4F",
"extra_labels_add": ["STM32F4", "STM32F411RE"],
"device_has_add": ["MPU"],
"config": {
"modem_is_on_board": {
"help": "Value: Tells the build system that the modem is on-board as oppose to a plug-in shield/module.",
Expand Down Expand Up @@ -4090,7 +4089,6 @@
"GNSSBAUD=9600",
"MBED_MPU_CUSTOM"
],
"overrides": { "lse_available": 0 },
"device_has_add": [
"ANALOGOUT",
"EMAC",
Expand All @@ -4102,6 +4100,7 @@
"device_name": "STM32F437VG",
"bootloader_supported": true,
"overrides": {
"lse_available": 0,
"network-default-interface-type": "ETHERNET"
}
},
Expand Down