Merge pull request #7330 from KariHaapalehto/clean_up

Clean-up targets.json
pull/7332/head
Cruz Monrreal 2018-06-27 18:44:41 -05:00 committed by GitHub
commit 5bf483ee17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions

View File

@ -1151,8 +1151,8 @@
"core": "Cortex-M4F", "core": "Cortex-M4F",
"extra_labels_add": ["STM32F4", "STM32F412xG", "STM32F412ZG", "WICED", "CYW43362"], "extra_labels_add": ["STM32F4", "STM32F412xG", "STM32F412ZG", "WICED", "CYW43362"],
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": ["CAN", "SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH", "EMAC"], "device_has_add": ["CAN", "SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH"],
"release_versions": ["2", "5"], "release_versions": ["5"],
"device_name": "STM32F412ZG", "device_name": "STM32F412ZG",
"bootloader_supported": true, "bootloader_supported": true,
"config": { "config": {
@ -1161,16 +1161,19 @@
"value": "USE_PLL_HSI", "value": "USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE" "macro_name": "CLOCK_SOURCE"
} }
},
"overrides": {
"network-default-interface-type": "WIFI"
} }
}, },
"USI_WM_BN_BM_22": { "USI_WM_BN_BM_22": {
"inherits": ["FAMILY_STM32"], "inherits": ["FAMILY_STM32"],
"core": "Cortex-M4F", "core": "Cortex-M4F",
"extra_labels_add": ["STM32F4", "STM32F412xG", "STM32F412ZG", "WICED", "CYW4343X", "CORDIO"], "extra_labels_add": ["STM32F4", "STM32F412xG", "STM32F412ZG", "WICED", "CYW4343X", "CORDIO"],
"features": ["LWIP", "BLE"], "features": ["BLE"],
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"], "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH", "EMAC"], "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "TRNG", "FLASH"],
"release_versions": ["2", "5"], "release_versions": ["5"],
"device_name": "STM32F412ZG", "device_name": "STM32F412ZG",
"bootloader_supported": true, "bootloader_supported": true,
"public": false, "public": false,
@ -1180,6 +1183,9 @@
"value": "USE_PLL_HSI", "value": "USE_PLL_HSI",
"macro_name": "CLOCK_SOURCE" "macro_name": "CLOCK_SOURCE"
} }
},
"overrides": {
"network-default-interface-type": "WIFI"
} }
}, },
"MTB_USI_WM_BN_BM_22": { "MTB_USI_WM_BN_BM_22": {