Backport #12421: Cypress target reorganization

- Remove CY8CMOD_062_4343W and merge into CY8CPROTO_062_4343W.
- Remove CY8CMOD_062S2_43012 and merge into CY8CKIT_062S2_43012.
- Remove CY8CMOD_062S3_4343W and merge into CY8CPROTO_062S3_4343W.
- Removed CY8CMODs from targets.json.
- Removed unnecessary PSOC6Code.complete post binary hook from cypress targets.
pull/12753/head
Dustin Crossman 2020-02-10 12:01:51 -08:00 committed by Kyle Kearney
parent 8199e25f24
commit a15ed110a6
50 changed files with 22 additions and 48 deletions

View File

@ -9164,7 +9164,7 @@
"macros_add": ["MCU_PSOC6_M4", "CY_RTOS_AWARE", "CY_USING_HAL", "MBED_TICKLESS"], "macros_add": ["MCU_PSOC6_M4", "CY_RTOS_AWARE", "CY_USING_HAL", "MBED_TICKLESS"],
"public": false "public": false
}, },
"CY8CMOD_062_4343W": { "CY8CPROTO_062_4343W": {
"inherits": ["MCU_PSOC6_M4"], "inherits": ["MCU_PSOC6_M4"],
"features": ["BLE"], "features": ["BLE"],
"components_add": ["WHD", "4343W", "CYW43XXX"], "components_add": ["WHD", "4343W", "CYW43XXX"],
@ -9175,28 +9175,42 @@
"CORDIO" "CORDIO"
], ],
"macros_add": ["CY8C624ABZI_D44", "CYBSP_WIFI_CAPABLE"], "macros_add": ["CY8C624ABZI_D44", "CYBSP_WIFI_CAPABLE"],
"public": false, "detect_code": [
"1901"
],
"bootloader_supported": false,
"sectors": [
[
268435456,
512
]
],
"overrides": { "overrides": {
"network-default-interface-type": "WIFI" "network-default-interface-type": "WIFI"
} }
}, },
"CY8CMOD_062S2_43012": { "CY8CKIT_062S2_43012": {
"inherits": ["MCU_PSOC6_M4"], "inherits": ["MCU_PSOC6_M4"],
"features": ["BLE"], "features": ["BLE"],
"components_add": ["WHD", "43012", "CYW43XXX"], "components_add": ["WHD", "43012", "CYW43XXX"],
"device_has_remove": ["ANALOGOUT"], "device_has_remove": ["ANALOGOUT"],
"supported_form_factors": [
"ARDUINO"
],
"extra_labels_add": [ "extra_labels_add": [
"PSOC6_02", "PSOC6_02",
"MXCRYPTO_02", "MXCRYPTO_02",
"CORDIO" "CORDIO"
], ],
"macros_add": ["CY8C624ABZI_D44", "CYBSP_WIFI_CAPABLE"], "macros_add": ["CY8C624ABZI_D44", "CYBSP_WIFI_CAPABLE"],
"public": false, "detect_code": [
"190B"
],
"overrides": { "overrides": {
"network-default-interface-type": "WIFI" "network-default-interface-type": "WIFI"
} }
}, },
"CY8CMOD_062S3_4343W": { "CY8CPROTO_062S3_4343W": {
"inherits": ["MCU_PSOC6_M4"], "inherits": ["MCU_PSOC6_M4"],
"features": ["BLE"], "features": ["BLE"],
"components_add": ["WHD", "4343W", "CYW43XXX"], "components_add": ["WHD", "4343W", "CYW43XXX"],
@ -9212,7 +9226,9 @@
"CY_ENABLE_XIP_PROGRAM", "CY_ENABLE_XIP_PROGRAM",
"CY_STORAGE_WIFI_DATA=\".cy_xip\"" "CY_STORAGE_WIFI_DATA=\".cy_xip\""
], ],
"public": false, "detect_code": [
"190E"
],
"overrides": { "overrides": {
"network-default-interface-type": "WIFI", "network-default-interface-type": "WIFI",
"xip-enable": true "xip-enable": true
@ -9253,9 +9269,6 @@
], ],
"macros_add": ["CY8C6247BZI_D54", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"], "macros_add": ["CY8C6247BZI_D54", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"],
"detect_code": ["1900"], "detect_code": ["1900"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"bootloader_supported": false, "bootloader_supported": false,
"sectors": [[268435456, 512]], "sectors": [[268435456, 512]],
"overrides": { "overrides": {
@ -9263,30 +9276,6 @@
}, },
"program_cycle_s": 10 "program_cycle_s": 10
}, },
"CY8CPROTO_062_4343W": {
"inherits": ["CY8CMOD_062_4343W"],
"detect_code": ["1901"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"bootloader_supported": false,
"sectors": [[268435456, 512]]
},
"CY8CPROTO_062S3_4343W": {
"inherits": ["CY8CMOD_062S3_4343W"],
"detect_code": ["190E"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
}
},
"CY8CKIT_062S2_43012": {
"inherits": ["CY8CMOD_062S2_43012"],
"supported_form_factors": ["ARDUINO"],
"detect_code": ["190B"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
}
},
"CY8CKIT_062_BLE": { "CY8CKIT_062_BLE": {
"inherits": ["MCU_PSOC6_M4"], "inherits": ["MCU_PSOC6_M4"],
"device_has_remove": ["USBDEVICE"], "device_has_remove": ["USBDEVICE"],
@ -9297,9 +9286,6 @@
], ],
"macros_add": ["CY8C6347BZI_BLD53"], "macros_add": ["CY8C6347BZI_BLD53"],
"detect_code": ["1902"], "detect_code": ["1902"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"sectors": [[268443648, 512]], "sectors": [[268443648, 512]],
"bootloader_supported": false "bootloader_supported": false
}, },
@ -9313,9 +9299,6 @@
], ],
"macros_add": ["CYBLE_416045_02"], "macros_add": ["CYBLE_416045_02"],
"detect_code": ["1904"], "detect_code": ["1904"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"sectors": [[268443648, 512]], "sectors": [[268443648, 512]],
"bootloader_supported": false "bootloader_supported": false
}, },
@ -9348,9 +9331,6 @@
], ],
"macros_add": ["CY8C6247BZI_D54", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"], "macros_add": ["CY8C6247BZI_D54", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"],
"detect_code": ["1900"], "detect_code": ["1900"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"bootloader_supported": false, "bootloader_supported": false,
"sectors": [[268435456, 512]], "sectors": [[268435456, 512]],
"overrides": { "overrides": {
@ -9369,9 +9349,6 @@
], ],
"macros_add": ["CY8C6247BZI_D54", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"], "macros_add": ["CY8C6247BZI_D54", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"],
"detect_code": ["1906"], "detect_code": ["1906"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"overrides": { "overrides": {
"network-default-interface-type": "WIFI" "network-default-interface-type": "WIFI"
} }
@ -9390,9 +9367,6 @@
], ],
"macros_add": ["CY8C6247FDI_D52", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"], "macros_add": ["CY8C6247FDI_D52", "CYHAL_UDB_SDIO", "CYBSP_WIFI_CAPABLE"],
"detect_code": ["1903"], "detect_code": ["1903"],
"post_binary_hook": {
"function": "PSOC6Code.complete"
},
"overrides": { "overrides": {
"network-default-interface-type": "WIFI" "network-default-interface-type": "WIFI"
} }