Update targets JSON to new format for dual core devices

Author: multiplemonomials

targets/targets.json5

@@ -3568,22 +3568,13 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
             "system_power_supply": "PWR_DIRECT_SMPS_SUPPLY",
             // Cannot enable overdrive mode because the default power supply is SMPS
             "enable-overdrive-mode": 0
-        }
-    },
-    "DISCO_H747I_CM7": {
-		// NOTE: inherit from MCU_STM32H747xI_CM7 first so that target's attributes get priority over
-		// DISCO_H747I's attributes.
-        "inherits": [
-		    "MCU_STM32H747xI_CM7",
-		    "DISCO_H747I"
-        ],
+        },
         "supported_form_factors": [
             "ARDUINO_UNO",
             "STMOD",
             "PMOD"
         ],
         "extra_labels_add": [
-            "DISCO_H747I",
             "MT25QL512"
         ],
         "components_add": [
@@ -3597,27 +3588,19 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
         ],
         "device_name": "STM32H747XIHx"
     },
+    "DISCO_H747I_CM7": {
+        // NOTE: inherit from MCU_STM32H747xI_CM7 first so that target's attributes get priority over
+        // DISCO_H747I's attributes.
+        "inherits": [
+            "MCU_STM32H747xI_CM7",
+            "DISCO_H747"
+        ]
+    },
     "DISCO_H747I_CM4": {
         "inherits": [
 			"MCU_STM32H747xI_CM4",
             "DISCO_H747I"
-        ],
-        "extra_labels_add": [
-            "DISCO_H747I",
-            "MT25QL512"
-        ],
-        "device_has_add": [
-            "QSPI"
-        ],
-        "components_add": [
-            "QSPIF"
-        ],
-        "supported_form_factors": [
-            "ARDUINO_UNO",
-            "STMOD",
-            "PMOD"
-        ],
-        "device_name": "STM32H747XIHx"
+        ]
     },
     // Umbrella target for all Arduino boards that use an H747 chip
     "STM32H747_ARDUINO": {
@@ -3687,21 +3670,10 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
         "image_url": "https://store-usa.arduino.cc/cdn/shop/products/ABX00063_00.default_643x483.jpg?v=1677493878"
     },
     "ARDUINO_GIGA_CM7": {
-        inherits: ["ARDUINO_GIGA"],
-        "core": "Cortex-M7FD",
-        "memory_bank_config": {
-            // Select flash bank 1
-            "IROM1": {
-                "start": 0x08000000,
-                "size": 0x100000
-            }
-        },
-        "extra_labels_add": [
-            "STM32H747xI_CM7"
-        ],
-        "macros_add": [
-            "CORE_CM7"
-        ]
+        inherits: ["MCU_STM32H747xI_CM7", "ARDUINO_GIGA"],
+    },
+    "ARDUINO_GIGA_CM4": {
+        inherits: ["MCU_STM32H747xI_CM4", "ARDUINO_GIGA"],
     },
     "ARDUINO_PORTENTA_H7": {
         "public": false,