Revert "STM32F7 targets.json cleaning"

This reverts commit a246164.

Author: adbridge

targets/targets.json

@@ -3018,6 +3018,7 @@
         "core": "Cortex-M7F",
         "extra_labels_add": [
             "STM32F7",
+            "STM32F746",
             "STM32F746xG",
             "STM32F746ZG"
         ],
@@ -3038,7 +3039,6 @@
             }
         },
         "macros_add": [
-            "STM32F746xx",
             "MBED_TICKLESS",
             "EXTRA_IDLE_STACK_REQUIRED",
             "USBHOST_OTHER"
@@ -3069,6 +3069,7 @@
         "core": "Cortex-M7F",
         "extra_labels_add": [
             "STM32F7",
+            "STM32F756",
             "STM32F756xG",
             "STM32F756ZG"
         ],
@@ -3089,7 +3090,6 @@
             }
         },
         "macros_add": [
-            "STM32F756xx",
             "MBED_TICKLESS",
             "EXTRA_IDLE_STACK_REQUIRED",
             "USBHOST_OTHER",
@@ -3117,12 +3117,11 @@
     },
     "NUCLEO_F767ZI": {
         "inherits": ["FAMILY_STM32"],
-        "components_add": [
-            "FLASHIAP"
-        ],
+        "components_add": ["FLASHIAP"],
         "core": "Cortex-M7FD",
         "extra_labels_add": [
             "STM32F7",
+            "STM32F767",
             "STM32F767xI",
             "STM32F767ZI"
         ],
@@ -3148,7 +3147,6 @@
         },
         "supported_form_factors": ["ARDUINO"],
         "macros_add": [
-            "STM32F767xx",
             "MBED_TICKLESS",
             "EXTRA_IDLE_STACK_REQUIRED",
             "USBHOST_OTHER"
@@ -3371,10 +3369,7 @@
     "UHURU_RAVEN": {
         "inherits": ["FAMILY_STM32"],
         "core": "Cortex-M7FD",
-        "extra_labels_add": [
-            "STM32F7",
-            "STM32F767xI"
-        ],
+        "extra_labels_add": ["STM32F7", "STM32F767", "STM32F767xI", "STM32F767VI"],
         "config": {
             "clock_source": {
                 "help": "Mask value : USE_PLL_HSE_EXTC | USE_PLL_HSE_XTAL | USE_PLL_HSI",
@@ -3391,9 +3386,6 @@
             "network-default-interface-type": "WIFI"
         },
         "components_add": ["SPIF"],
-        "macros_add": [
-            "STM32F767xx"
-        ],
         "detect_code": ["9020"],
         "device_has_add": ["ANALOGOUT", "CAN", "CRC", "TRNG", "FLASH", "MPU"],
         "device_has_remove": ["SERIAL_FC"],
@@ -4240,7 +4232,9 @@
         "core": "Cortex-M7F",
         "extra_labels_add": [
             "STM32F7",
-            "STM32F746xG"
+            "STM32F746",
+            "STM32F746xG",
+            "STM32F746NG"
         ],
         "components_add": ["QSPIF", "FLASHIAP"],
         "supported_form_factors": ["ARDUINO"],
@@ -4261,8 +4255,6 @@
         },
         "detect_code": ["0815"],
         "macros_add": [
-            "STM32F746xx",
-            "HSE_VALUE=25000000",
             "MBED_TICKLESS",
             "EXTRA_IDLE_STACK_REQUIRED",
             "USB_STM_HAL",
@@ -4293,7 +4285,9 @@
         "core": "Cortex-M7FD",
         "extra_labels_add": [
             "STM32F7",
-            "STM32F769xI"
+            "STM32F769",
+            "STM32F769xI",
+            "STM32F769NI"
         ],
         "components_add": ["QSPIF"],
         "supported_form_factors": ["ARDUINO"],
@@ -4314,8 +4308,6 @@
         },
         "detect_code": ["0817"],
         "macros_add": [
-            "STM32F769xx",
-            "HSE_VALUE=25000000",
             "MBED_TICKLESS",
             "EXTRA_IDLE_STACK_REQUIRED",
             "USB_STM_HAL",