Merge pull request #12421 from dustin-crossman/pr/cy_targets_reorgani…

…zation Cypress Targets Reorganization
ARMmbed · Feb 24, 2020 · 1629103 · 1629103
2 parents bb48fa4 + 286af23
commit 1629103
Show file tree

Hide file tree

Showing 50 changed files with 22 additions and 67 deletions.
diff --git a/...RGET_CY8CMOD_062S2_43012/PeripheralPins.c → ...RGET_CY8CKIT_062S2_43012/PeripheralPins.c b/...RGET_CY8CMOD_062S2_43012/PeripheralPins.c → ...RGET_CY8CKIT_062S2_43012/PeripheralPins.c
diff --git a/...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct → ...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct b/...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct → ...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct
diff --git a/.../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S b/.../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S
diff --git a/...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld → ...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld b/...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld → ...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld
diff --git a/...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S → ...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S b/...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S → ...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S
diff --git a/...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf → ...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf b/...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf → ...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf
diff --git a/.../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S b/.../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S
diff --git a/...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c → ...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c b/...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c → ...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c
diff --git a/...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct → ...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct b/...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct → ...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct
diff --git a/..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S b/..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S
diff --git a/...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld → ...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld b/...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld → ...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld
diff --git a/.../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S → .../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S b/.../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S → .../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S
diff --git a/...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf → ...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf b/...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf → ...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf
diff --git a/..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S b/..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S
diff --git a/...2/device/COMPONENT_CM4/system_psoc6_cm4.c → ...2/device/COMPONENT_CM4/system_psoc6_cm4.c b/...2/device/COMPONENT_CM4/system_psoc6_cm4.c → ...2/device/COMPONENT_CM4/system_psoc6_cm4.c
diff --git a/...CY8CMOD_062S2_43012/device/system_psoc6.h → ...CY8CKIT_062S2_43012/device/system_psoc6.h b/...CY8CMOD_062S2_43012/device/system_psoc6.h → ...CY8CKIT_062S2_43012/device/system_psoc6.h
diff --git a/...GET_CY8CMOD_062S3_4343W/PeripheralNames.h → ...T_CY8CPROTO_062S3_4343W/PeripheralNames.h b/...GET_CY8CMOD_062S3_4343W/PeripheralNames.h → ...T_CY8CPROTO_062S3_4343W/PeripheralNames.h
diff --git a/...RGET_CY8CMOD_062S3_4343W/PeripheralPins.c → ...ET_CY8CPROTO_062S3_4343W/PeripheralPins.c b/...RGET_CY8CMOD_062S3_4343W/PeripheralPins.c → ...ET_CY8CPROTO_062S3_4343W/PeripheralPins.c
diff --git a/...T_CM0P/TOOLCHAIN_ARM/cy8c6xx5_cm0plus.sct → ...T_CM0P/TOOLCHAIN_ARM/cy8c6xx5_cm0plus.sct b/...T_CM0P/TOOLCHAIN_ARM/cy8c6xx5_cm0plus.sct → ...T_CM0P/TOOLCHAIN_ARM/cy8c6xx5_cm0plus.sct
diff --git a/.../TOOLCHAIN_ARM/startup_psoc6_03_cm0plus.S → .../TOOLCHAIN_ARM/startup_psoc6_03_cm0plus.S b/.../TOOLCHAIN_ARM/startup_psoc6_03_cm0plus.S → .../TOOLCHAIN_ARM/startup_psoc6_03_cm0plus.S
diff --git a/...M0P/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm0plus.ld → ...M0P/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm0plus.ld b/...M0P/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm0plus.ld → ...M0P/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm0plus.ld
diff --git a/...LCHAIN_GCC_ARM/startup_psoc6_03_cm0plus.S → ...LCHAIN_GCC_ARM/startup_psoc6_03_cm0plus.S b/...LCHAIN_GCC_ARM/startup_psoc6_03_cm0plus.S → ...LCHAIN_GCC_ARM/startup_psoc6_03_cm0plus.S
diff --git a/...T_CM0P/TOOLCHAIN_IAR/cy8c6xx5_cm0plus.icf → ...T_CM0P/TOOLCHAIN_IAR/cy8c6xx5_cm0plus.icf b/...T_CM0P/TOOLCHAIN_IAR/cy8c6xx5_cm0plus.icf → ...T_CM0P/TOOLCHAIN_IAR/cy8c6xx5_cm0plus.icf
diff --git a/.../TOOLCHAIN_IAR/startup_psoc6_03_cm0plus.S → .../TOOLCHAIN_IAR/startup_psoc6_03_cm0plus.S b/.../TOOLCHAIN_IAR/startup_psoc6_03_cm0plus.S → .../TOOLCHAIN_IAR/startup_psoc6_03_cm0plus.S
diff --git a/...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c → ...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c b/...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c → ...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c
diff --git a/...T_CM4/TOOLCHAIN_ARM/cy8c6xx5_cm4_dual.sct → ...T_CM4/TOOLCHAIN_ARM/cy8c6xx5_cm4_dual.sct b/...T_CM4/TOOLCHAIN_ARM/cy8c6xx5_cm4_dual.sct → ...T_CM4/TOOLCHAIN_ARM/cy8c6xx5_cm4_dual.sct
diff --git a/..._CM4/TOOLCHAIN_ARM/startup_psoc6_03_cm4.S → ..._CM4/TOOLCHAIN_ARM/startup_psoc6_03_cm4.S b/..._CM4/TOOLCHAIN_ARM/startup_psoc6_03_cm4.S → ..._CM4/TOOLCHAIN_ARM/startup_psoc6_03_cm4.S
diff --git a/...M4/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm4_dual.ld → ...M4/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm4_dual.ld b/...M4/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm4_dual.ld → ...M4/TOOLCHAIN_GCC_ARM/cy8c6xx5_cm4_dual.ld
diff --git a/.../TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm4.S → .../TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm4.S b/.../TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm4.S → .../TOOLCHAIN_GCC_ARM/startup_psoc6_03_cm4.S
diff --git a/...T_CM4/TOOLCHAIN_IAR/cy8c6xx5_cm4_dual.icf → ...T_CM4/TOOLCHAIN_IAR/cy8c6xx5_cm4_dual.icf b/...T_CM4/TOOLCHAIN_IAR/cy8c6xx5_cm4_dual.icf → ...T_CM4/TOOLCHAIN_IAR/cy8c6xx5_cm4_dual.icf
diff --git a/..._CM4/TOOLCHAIN_IAR/startup_psoc6_03_cm4.S → ..._CM4/TOOLCHAIN_IAR/startup_psoc6_03_cm4.S b/..._CM4/TOOLCHAIN_IAR/startup_psoc6_03_cm4.S → ..._CM4/TOOLCHAIN_IAR/startup_psoc6_03_cm4.S
diff --git a/...W/device/COMPONENT_CM4/system_psoc6_cm4.c → ...W/device/COMPONENT_CM4/system_psoc6_cm4.c b/...W/device/COMPONENT_CM4/system_psoc6_cm4.c → ...W/device/COMPONENT_CM4/system_psoc6_cm4.c
diff --git a/...CY8CMOD_062S3_4343W/device/system_psoc6.h → ...8CPROTO_062S3_4343W/device/system_psoc6.h b/...CY8CMOD_062S3_4343W/device/system_psoc6.h → ...8CPROTO_062S3_4343W/device/system_psoc6.h
diff --git a/...TARGET_CY8CMOD_062_4343W/PeripheralPins.c → ...RGET_CY8CPROTO_062_4343W/PeripheralPins.c b/...TARGET_CY8CMOD_062_4343W/PeripheralPins.c → ...RGET_CY8CPROTO_062_4343W/PeripheralPins.c
diff --git a/...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct → ...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct b/...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct → ...T_CM0P/TOOLCHAIN_ARM/cy8c6xxa_cm0plus.sct
diff --git a/.../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S b/.../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_ARM/startup_psoc6_02_cm0plus.S
diff --git a/...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld → ...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld b/...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld → ...M0P/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm0plus.ld
diff --git a/...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S → ...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S b/...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S → ...LCHAIN_GCC_ARM/startup_psoc6_02_cm0plus.S
diff --git a/...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf → ...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf b/...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf → ...T_CM0P/TOOLCHAIN_IAR/cy8c6xxa_cm0plus.icf
diff --git a/.../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S b/.../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S → .../TOOLCHAIN_IAR/startup_psoc6_02_cm0plus.S
diff --git a/...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c → ...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c b/...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c → ...ice/COMPONENT_CM0P/system_psoc6_cm0plus.c
diff --git a/...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct → ...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct b/...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct → ...T_CM4/TOOLCHAIN_ARM/cy8c6xxa_cm4_dual.sct
diff --git a/..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S b/..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_ARM/startup_psoc6_02_cm4.S
diff --git a/...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld → ...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld b/...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld → ...M4/TOOLCHAIN_GCC_ARM/cy8c6xxa_cm4_dual.ld
diff --git a/.../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S → .../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S b/.../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S → .../TOOLCHAIN_GCC_ARM/startup_psoc6_02_cm4.S
diff --git a/...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf → ...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf b/...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf → ...T_CM4/TOOLCHAIN_IAR/cy8c6xxa_cm4_dual.icf
diff --git a/..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S b/..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S → ..._CM4/TOOLCHAIN_IAR/startup_psoc6_02_cm4.S
diff --git a/...W/device/COMPONENT_CM4/system_psoc6_cm4.c → ...W/device/COMPONENT_CM4/system_psoc6_cm4.c b/...W/device/COMPONENT_CM4/system_psoc6_cm4.c → ...W/device/COMPONENT_CM4/system_psoc6_cm4.c
diff --git a/...T_CY8CMOD_062_4343W/device/system_psoc6.h → ...CY8CPROTO_062_4343W/device/system_psoc6.h b/...T_CY8CMOD_062_4343W/device/system_psoc6.h → ...CY8CPROTO_062_4343W/device/system_psoc6.h
diff --git a/targets/targets.json b/targets/targets.json
@@ -13514,7 +13514,7 @@
         ],
         "public": false
     },
-    "CY8CMOD_062_4343W": {
+    "CY8CPROTO_062_4343W": {
         "inherits": [
             "MCU_PSOC6_M4"
         ],
@@ -13538,12 +13538,21 @@
             "CY8C624ABZI_D44",
             "CYBSP_WIFI_CAPABLE"
         ],
-        "public": false,
+        "detect_code": [
+            "1901"
+        ],
+        "bootloader_supported": false,
+        "sectors": [
+            [
+                268435456,
+                512
+            ]
+        ],
         "overrides": {
             "network-default-interface-type": "WIFI"
         }
     },
-    "CY8CMOD_062S2_43012": {
+    "CY8CKIT_062S2_43012": {
         "inherits": [
             "MCU_PSOC6_M4"
         ],
@@ -13555,6 +13564,9 @@
             "43012",
             "CYW43XXX"
         ],
+        "supported_form_factors": [
+            "ARDUINO"
+        ],
         "device_has_remove": [
             "ANALOGOUT"
         ],
@@ -13567,12 +13579,14 @@
             "CY8C624ABZI_D44",
             "CYBSP_WIFI_CAPABLE"
         ],
-        "public": false,
+        "detect_code": [
+            "190B"
+        ],
         "overrides": {
             "network-default-interface-type": "WIFI"
         }
     },
-    "CY8CMOD_062S3_4343W": {
+    "CY8CPROTO_062S3_4343W": {
         "inherits": [
             "MCU_PSOC6_M4"
         ],
@@ -13598,7 +13612,9 @@
             "CY_ENABLE_XIP_PROGRAM",
             "CY_STORAGE_WIFI_DATA=\".cy_xip\""
         ],
-        "public": false,
+        "detect_code": [
+            "190E"
+        ],
         "overrides": {
             "network-default-interface-type": "WIFI",
             "xip-enable": true
@@ -13675,9 +13691,6 @@
         "detect_code": [
             "1900"
         ],
-        "post_binary_hook": {
-            "function": "PSOC6Code.complete"
-        },
         "bootloader_supported": false,
         "sectors": [
             [
@@ -13690,49 +13703,6 @@
         },
         "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": {
         "inherits": [
             "MCU_PSOC6_M4"
@@ -13753,9 +13723,6 @@
         "detect_code": [
             "1902"
         ],
-        "post_binary_hook": {
-            "function": "PSOC6Code.complete"
-        },
         "sectors": [
             [
                 268443648,
@@ -13785,9 +13752,6 @@
         "detect_code": [
             "1904"
         ],
-        "post_binary_hook": {
-            "function": "PSOC6Code.complete"
-        },
         "sectors": [
             [
                 268443648,
@@ -13854,9 +13818,6 @@
         "detect_code": [
             "1900"
         ],
-        "post_binary_hook": {
-            "function": "PSOC6Code.complete"
-        },
         "bootloader_supported": false,
         "sectors": [
             [
@@ -13894,9 +13855,6 @@
         "detect_code": [
             "1906"
         ],
-        "post_binary_hook": {
-            "function": "PSOC6Code.complete"
-        },
         "overrides": {
             "network-default-interface-type": "WIFI"
         }
@@ -13936,9 +13894,6 @@
         "detect_code": [
             "1903"
         ],
-        "post_binary_hook": {
-            "function": "PSOC6Code.complete"
-        },
         "overrides": {
             "network-default-interface-type": "WIFI"
         }