Upconvert several targets' form factors to ARDUINO_UNO (#359)

* Upconvert several targets' form factors to arduino uno

* Oops fix some unintentional changes

* Add MCU description, fix pin validation errors

drivers/usb/include/usb/internal/Task.h

@@ -29,7 +29,7 @@ namespace events {
  */
 
 
-template<typename F, typename A1 = void, typename A2 = void, typename A3 = void, typename A4 = void, typename A5 = void>
+template<typename F, typename ARG1 = void, typename ARG2 = void, typename ARG3 = void, typename ARG4 = void, typename ARG5 = void>
 struct AllArgs;
 
 template<typename B0>
@@ -543,24 +543,24 @@ private:
     All _args;
 };
 
-template <typename R, typename A0>
+template <typename R, typename ARG0>
-class Task<R(A0)>: public TaskBase {
+class Task<R(ARG0)>: public TaskBase {
 public:
 
-    Task(TaskQueue *q = NULL, mbed::Callback<R(A0)> cb = mbed::Callback<R(A0)>())
+    Task(TaskQueue *q = NULL, mbed::Callback<R(ARG0)> cb = mbed::Callback<R(ARG0)>())
         : TaskBase(q), _args(cb)
     {
     }
 
-    Task &operator=(mbed::Callback<R(A0)> cb)
+    Task &operator=(mbed::Callback<R(ARG0)> cb)
     {
         _args.b0 = cb;
         return *this;
     }
 
-    void call(A0 a0)
+    void call(ARG0 arg0)
     {
-        _args.b1 = a0;
+        _args.b1 = arg0;
         post();
     }
 
@@ -578,7 +578,7 @@ protected:
     }
 
 private:
-    typedef AllArgs<mbed::Callback<R(A0)>, A0> All;
+    typedef AllArgs<mbed::Callback<R(ARG0)>, ARG0> All;
     All _args;
 };
 
@@ -586,8 +586,8 @@ private:
  *
  *  Representation of a postable task
  */
-template <typename R, typename A0, typename A1>
+template <typename R, typename ARG0, typename ARG1>
-class Task<R(A0, A1)>: public TaskBase {
+class Task<R(ARG0, ARG1)>: public TaskBase {
 public:
 
     /**
@@ -596,7 +596,7 @@ public:
      * @param q TaskQueue to post to
      * @param cb Callback to run
      */
-    Task(TaskQueue *q = NULL, mbed::Callback<R(A0, A1)> cb = mbed::Callback<R(A0, A1)>())
+    Task(TaskQueue *q = NULL, mbed::Callback<R(ARG0, ARG1)> cb = mbed::Callback<R(ARG0, ARG1)>())
         : TaskBase(q), _args(cb)
     {
     }
@@ -606,7 +606,7 @@ public:
      *
      * @param cb Callback to run
      */
-    Task &operator=(mbed::Callback<R(A0, A1)> cb)
+    Task &operator=(mbed::Callback<R(ARG0, ARG1)> cb)
     {
         _args.b0 = cb;
         return *this;
@@ -620,13 +620,13 @@ public:
      * expects two integers as arguments to call, while Task<void()>
      * expects no arguments.
      *
-     * @param a0 First callback parameter
+     * @param arg0 First callback parameter
-     * @param a1 Second callback parameter
+     * @param arg1 Second callback parameter
      */
-    void call(A0 a0, A1 a1)
+    void call(ARG0 arg0, ARG1 arg1)
     {
-        _args.b1 = a0;
+        _args.b1 = arg0;
-        _args.b2 = a1;
+        _args.b2 = arg1;
         post();
     }
 
@@ -644,7 +644,7 @@ protected:
     }
 
 private:
-    typedef AllArgs<mbed::Callback<R(A0, A1)>, A0, A1> All;
+    typedef AllArgs<mbed::Callback<R(ARG0, ARG1)>, ARG0, ARG1> All;
     All _args;
 };
 

targets/TARGET_Cypress/TARGET_PSOC6/PinNames.h

@@ -85,28 +85,18 @@
 // LEDs
 #ifdef CYBSP_USER_LED1
 #define LED1 CYBSP_USER_LED1
-#else
-#define LED1 NC
 #endif
 #ifdef CYBSP_USER_LED2
 #define LED2 CYBSP_USER_LED2
-#else
-#define LED2 NC
 #endif
 #ifdef CYBSP_USER_LED3
 #define LED3 CYBSP_USER_LED3
-#else
-#define LED3 NC
 #endif
 #ifdef CYBSP_USER_LED4
 #define LED4 CYBSP_USER_LED4
-#else
-#define LED4 NC
 #endif
 #ifdef CYBSP_USER_LED5
 #define LED5 CYBSP_USER_LED5
-#else
-#define LED5 NC
 #endif
 
 #ifdef CYBSP_LED_RGB_RED
@@ -152,71 +142,29 @@
 #endif
 
 // Arduino Header
-#ifdef CYBSP_A0
+#ifdef TARGET_FF_ARDUINO_UNO
-#define A0 CYBSP_A0
+#define ARDUINO_UNO_A0 CYBSP_A0
-#endif
+#define ARDUINO_UNO_A1 CYBSP_A1
-#ifdef CYBSP_A1
+#define ARDUINO_UNO_A2 CYBSP_A2
-#define A1 CYBSP_A1
+#define ARDUINO_UNO_A3 CYBSP_A3
-#endif
+#define ARDUINO_UNO_A4 CYBSP_A4
-#ifdef CYBSP_A2
+#define ARDUINO_UNO_A5 CYBSP_A5
-#define A2 CYBSP_A2
+#define ARDUINO_UNO_D0 CYBSP_D0
-#endif
+#define ARDUINO_UNO_D1 CYBSP_D1
-#ifdef CYBSP_A3
+#define ARDUINO_UNO_D2 CYBSP_D2
-#define A3 CYBSP_A3
+#define ARDUINO_UNO_D3 CYBSP_D3
-#endif
+#define ARDUINO_UNO_D4 CYBSP_D4
-#ifdef CYBSP_A4
+#define ARDUINO_UNO_D5 CYBSP_D5
-#define A4 CYBSP_A4
+#define ARDUINO_UNO_D6 CYBSP_D6
-#endif
+#define ARDUINO_UNO_D7 CYBSP_D7
-#ifdef CYBSP_A5
+#define ARDUINO_UNO_D8 CYBSP_D8
-#define A5 CYBSP_A5
+#define ARDUINO_UNO_D9 CYBSP_D9
-#endif
+#define ARDUINO_UNO_D10 CYBSP_D10
-#ifdef CYBSP_D0
+#define ARDUINO_UNO_D11 CYBSP_D11
-#define D0 CYBSP_D0
+#define ARDUINO_UNO_D12 CYBSP_D12
-#endif
+#define ARDUINO_UNO_D13 CYBSP_D13
-#ifdef CYBSP_D1
+#define ARDUINO_UNO_D14 CYBSP_D14
-#define D1 CYBSP_D1
+#define ARDUINO_UNO_D15 CYBSP_D15
-#endif
-#ifdef CYBSP_D2
-#define D2 CYBSP_D2
-#endif
-#ifdef CYBSP_D3
-#define D3 CYBSP_D3
-#endif
-#ifdef CYBSP_D4
-#define D4 CYBSP_D4
-#endif
-#ifdef CYBSP_D5
-#define D5 CYBSP_D5
-#endif
-#ifdef CYBSP_D6
-#define D6 CYBSP_D6
-#endif
-#ifdef CYBSP_D7
-#define D7 CYBSP_D7
-#endif
-#ifdef CYBSP_D8
-#define D8 CYBSP_D8
-#endif
-#ifdef CYBSP_D9
-#define D9 CYBSP_D9
-#endif
-#ifdef CYBSP_D10
-#define D10 CYBSP_D10
-#endif
-#ifdef CYBSP_D11
-#define D11 CYBSP_D11
-#endif
-#ifdef CYBSP_D12
-#define D12 CYBSP_D12
-#endif
-#ifdef CYBSP_D13
-#define D13 CYBSP_D13
-#endif
-#ifdef CYBSP_D14
-#define D14 CYBSP_D14
-#endif
-#ifdef CYBSP_D15
-#define D15 CYBSP_D15
 #endif
 
 #endif // MBED_PINNAMES_H

targets/TARGET_Cypress/TARGET_PSOC6/PinNamesTypes.h

@@ -28,74 +28,6 @@
 #define PullDown CYHAL_GPIO_DRIVE_PULLDOWN
 #define PullUp CYHAL_GPIO_DRIVE_PULLUP
 
-// Arduino Headers
-#ifdef CYBSP_A0
-#define A0 CYBSP_A0
-#endif
-#ifdef CYBSP_A1
-#define A1 CYBSP_A1
-#endif
-#ifdef CYBSP_A2
-#define A2 CYBSP_A2
-#endif
-#ifdef CYBSP_A3
-#define A3 CYBSP_A3
-#endif
-#ifdef CYBSP_A4
-#define A4 CYBSP_A4
-#endif
-#ifdef CYBSP_A5
-#define A5 CYBSP_A5
-#endif
-#ifdef CYBSP_D0
-#define D0 CYBSP_D0
-#endif
-#ifdef CYBSP_D1
-#define D1 CYBSP_D1
-#endif
-#ifdef CYBSP_D2
-#define D2 CYBSP_D2
-#endif
-#ifdef CYBSP_D3
-#define D3 CYBSP_D3
-#endif
-#ifdef CYBSP_D4
-#define D4 CYBSP_D4
-#endif
-#ifdef CYBSP_D5
-#define D5 CYBSP_D5
-#endif
-#ifdef CYBSP_D6
-#define D6 CYBSP_D6
-#endif
-#ifdef CYBSP_D7
-#define D7 CYBSP_D7
-#endif
-#ifdef CYBSP_D8
-#define D8 CYBSP_D8
-#endif
-#ifdef CYBSP_D9
-#define D9 CYBSP_D9
-#endif
-#ifdef CYBSP_D10
-#define D10 CYBSP_D10
-#endif
-#ifdef CYBSP_D11
-#define D11 CYBSP_D11
-#endif
-#ifdef CYBSP_D12
-#define D12 CYBSP_D12
-#endif
-#ifdef CYBSP_D13
-#define D13 CYBSP_D13
-#endif
-#ifdef CYBSP_D14
-#define D14 CYBSP_D14
-#endif
-#ifdef CYBSP_D15
-#define D15 CYBSP_D15
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h

@@ -64,55 +64,49 @@ typedef enum {
     LED_GREEN = PTA19,
     LED_BLUE  = PTA18,
 
-    // mbed original LED naming
+    // LEDs and buttons
-    LED1 = LED_RED,
+#define LED1 PTC1
-    LED2 = LED_GREEN,
+#define LED2 PTA19
-    LED3 = LED_BLUE,
+#define LED3 PTA18
-    LED4 = LED_RED,
 
-    //Push buttons
+#define BUTTON1 PTC4
-    SW3 = PTC4,
+#define BUTTON2 PTC5
-    SW4 = PTC5,
-    // Standardized button names
-    BUTTON1 = SW3,
-    BUTTON2 = SW4,
 
     // USB Pins
     CONSOLE_TX = PTC7,
     CONSOLE_RX = PTC6,
 
-    // Arduino Headers
-    D0 = PTC6,
-    D1 = PTC7,
-    D2 = PTC19,
-    D3 = PTC16,
-    D4 = PTC4,
-    D5 = PTC17,
-    D6 = PTC18,
-    D7 = PTA1,
-    D8 = PTA0,
-    D9 = PTC1,
-    D10 = PTA19,
-    D11 = PTA16,
-    D12 = PTA17,
-    D13 = PTA18,
-    D14 = PTC3,
-    D15 = PTC2,
-
-    I2C_SCL = D15,
-    I2C_SDA = D14,
-
-    DAC0_OUT = PTB18,
-
-    A0 = (int)0xFFFFFFFF,
-    A1 = DAC0_OUT,
-    A2 = PTB2,
-    A3 = PTB3,
-    A4 = PTB1,
-    A5 = PTB0,
-
     // Not connected
-    NC = (int)0xFFFFFFFF
+    NC = (int)0xFFFFFFFF,
+
+#ifdef TARGET_FF_ARDUINO_UNO
+    // Arduino Headers
+    ARDUINO_UNO_D0 = PTC6,
+    ARDUINO_UNO_D1 = PTC7,
+    ARDUINO_UNO_D2 = PTC19,
+    ARDUINO_UNO_D3 = PTC16,
+    ARDUINO_UNO_D4 = PTC4,
+    ARDUINO_UNO_D5 = PTC17,
+    ARDUINO_UNO_D6 = PTC18,
+    ARDUINO_UNO_D7 = PTA1,
+    ARDUINO_UNO_D8 = PTA0,
+    ARDUINO_UNO_D9 = PTC1,
+    ARDUINO_UNO_D10 = PTA19,
+    ARDUINO_UNO_D11 = PTA16,
+    ARDUINO_UNO_D12 = PTA17,
+    ARDUINO_UNO_D13 = PTA18,
+    ARDUINO_UNO_D14 = PTC3,
+    ARDUINO_UNO_D15 = PTC2,
+
+    ARDUINO_UNO_A0 = NC,
+    ARDUINO_UNO_A1 = PTB18,
+    ARDUINO_UNO_A2 = PTB2,
+    ARDUINO_UNO_A3 = PTB3,
+    ARDUINO_UNO_A4 = PTB1,
+    ARDUINO_UNO_A5 = PTB0,
+#endif
+
+    DAC0_OUT = PTB18
 } PinName;
 
 

targets/TARGET_GigaDevice/TARGET_GD32F30X/TARGET_GD32F307VG/PinNames.h

@@ -151,53 +151,45 @@ typedef enum {
     ADC_TEMP = 0xF0,
     ADC_VREF = 0xF1,
 
-
+#ifdef TARGET_FF_ARDUINO_UNO
     /* Arduino connector namings */
-    A0          = PORTC_0,
+    ARDUINO_UNO_A0  = PORTC_0,
-    A1          = PORTC_1,
+    ARDUINO_UNO_A1  = PORTC_1,
-    A2          = PORTC_2,
+    ARDUINO_UNO_A2  = PORTC_2,
-    A3          = PORTC_3,
+    ARDUINO_UNO_A3  = PORTC_3,
-    A4          = PORTA_0,
+    ARDUINO_UNO_A4  = PORTA_0,
-    A5          = PORTB_1,
+    ARDUINO_UNO_A5  = PORTB_1,
-    D0          = PORTA_3,
+    ARDUINO_UNO_D0  = PORTA_3,
-    D1          = PORTA_2,
+    ARDUINO_UNO_D1  = PORTA_2,
-    D2          = PORTE_4,
+    ARDUINO_UNO_D2  = PORTE_4,
-    D3          = PORTD_12,
+    ARDUINO_UNO_D3  = PORTD_12,
-    D4          = PORTB_3,
+    ARDUINO_UNO_D4  = PORTB_3,
-    D5          = PORTC_7,
+    ARDUINO_UNO_D5  = PORTC_7,
-    D6          = PORTB_0,
+    ARDUINO_UNO_D6  = PORTB_0,
-    D7          = PORTB_4,
+    ARDUINO_UNO_D7  = PORTB_4,
-    D8          = PORTD_11,
+    ARDUINO_UNO_D8  = PORTD_11,
-    D9          = PORTE_5,
+    ARDUINO_UNO_D9  = PORTE_5,
-    D10         = PORTA_8,
+    ARDUINO_UNO_D10 = PORTA_8,
-    D11         = PORTB_15,
+    ARDUINO_UNO_D11 = PORTB_15,
-    D12         = PORTB_14,
+    ARDUINO_UNO_D12 = PORTB_14,
-    D13         = PORTB_13,
+    ARDUINO_UNO_D13 = PORTB_13,
-    D14         = PORTB_9,
+    ARDUINO_UNO_D14 = PORTB_9,
-    D15         = PORTB_8,
+    ARDUINO_UNO_D15 = PORTB_8,
+#endif
 
-    LED1        = PORTE_0,
+#define LED1 PORTE_0
-    LED2        = PORTE_1,
+#define LED2 PORTE_1
-    LED3        = PORTE_6,
+#define LED3 PORTE_6
 
-    KEY1        = PORTE_2,
+#define BUTTON1 PORTE_2
-    KEY2        = PORTE_7,
+#define BUTTON2 PORTE_7
-
-    BUTTON1     = KEY1,
-    BUTTON2     = KEY2,
 
     SERIAL_TX   = PORTC_10,
     SERIAL_RX   = PORTC_11,
     CONSOLE_TX       = SERIAL_TX,
     CONSOLE_RX       = SERIAL_RX,
 
-    I2C_SCL     = D15,
+    PWM_OUT     = PORTE_5,
-    I2C_SDA     = D14,
-    SPI_MOSI    = D11,
-    SPI_MISO    = D12,
-    SPI_SCK     = D13,
-    SPI_CS      = D10,
-    PWM_OUT     = D9,
 
     USBFS_VBUS  = PORTA_9,
     USBFS_DM    = PORTA_11,

targets/TARGET_GigaDevice/TARGET_GD32F4XX/TARGET_GD32F450ZI/PinNames.h

@@ -207,52 +207,45 @@ typedef enum {
     ADC_VREF = 0xF1,
     ADC_VBAT = 0xF2,
 
+#ifdef TARGET_FF_ARDUINO_UNO
     /* Arduino connector pin definitions */
-    A0          = PORTC_0,
+    ARDUINO_UNO_A0  = PORTC_0,
-    A1          = PORTA_5,
+    ARDUINO_UNO_A1  = PORTA_5,
-    A2          = PORTC_2,
+    ARDUINO_UNO_A2  = PORTC_2,
-    A3          = PORTC_3,
+    ARDUINO_UNO_A3  = PORTC_3,
-    A4          = PORTA_0,      /* PORTB_11 */
+    ARDUINO_UNO_A4  = PORTA_0,      /* PORTB_11 */
-    A5          = PORTC_5,      /* PORTB_10 */
+    ARDUINO_UNO_A5  = PORTC_5,      /* PORTB_10 */
-    D0          = PORTC_11,
+    ARDUINO_UNO_D0  = PORTC_11,
-    D1          = PORTC_10,
+    ARDUINO_UNO_D1  = PORTC_10,
-    D2          = PORTA_15,
+    ARDUINO_UNO_D2  = PORTA_15,
-    D3          = PORTD_12,
+    ARDUINO_UNO_D3  = PORTD_12,
-    D4          = PORTC_8,
+    ARDUINO_UNO_D4  = PORTC_8,
-    D5          = PORTC_7,
+    ARDUINO_UNO_D5  = PORTC_7,
-    D6          = PORTB_0,
+    ARDUINO_UNO_D6  = PORTB_0,
-    D7          = PORTC_12,
+    ARDUINO_UNO_D7  = PORTC_12,
-    D8          = PORTD_13,
+    ARDUINO_UNO_D8  = PORTD_13,
-    D9          = PORTA_8,
+    ARDUINO_UNO_D9  = PORTA_8,
-    D10         = PORTA_1,
+    ARDUINO_UNO_D10 = PORTA_1,
-    D11         = PORTB_15,
+    ARDUINO_UNO_D11 = PORTB_15,
-    D12         = PORTB_14,
+    ARDUINO_UNO_D12 = PORTB_14,
-    D13         = PORTB_13,
+    ARDUINO_UNO_D13 = PORTB_13,
-    D14         = PORTB_9,
+    ARDUINO_UNO_D14 = PORTB_9,
-    D15         = PORTB_8,
+    ARDUINO_UNO_D15 = PORTB_8,
+#endif
 
-    LED1        = PORTF_6,
+#define LED1 PORTF_6
-    LED2        = PORTC_13,
+#define LED2 PORTC_13
-    LED3        = PORTE_6,
+#define LED3 PORTE_6
 
-    KEY1        = PORTE_5,
+#define BUTTON1 PORTE_5
-    KEY2        = PORTE_4,
+#define BUTTON2 PORTE_4
-
-    BUTTON1     = KEY1,
-    BUTTON2     = KEY2,
 
     SERIAL_TX   = PORTC_12,
     SERIAL_RX   = PORTD_2,
     CONSOLE_TX       = SERIAL_TX,
     CONSOLE_RX       = SERIAL_RX,
 
-    I2C_SCL     = PORTB_6,
+    PWM_OUT     = PORTA_8,
-    I2C_SDA     = PORTB_7,
-    SPI_MOSI    = PORTB_5,
-    SPI_MISO    = PORTB_4,
-    SPI_SCK     = PORTB_3,
-    SPI_CS      = PORTE_2,
-    PWM_OUT     = D9,
 
     USBFS_VBUS  = PORTA_9,
     USBFS_DM    = PORTA_11,

targets/TARGET_RENESAS/TARGET_RZ_A1XX/TARGET_RZ_A1H/PinNames.h

@@ -49,10 +49,10 @@ typedef enum {
     P11_0,P11_1,P11_2,P11_3,P11_4,P11_5,P11_6,P11_7,P11_8,P11_9,P11_10,P11_11,P11_12,P11_13,P11_14,P11_15, 
 
     // mbed Pin Names
-    LED1 = P6_13,
+#define LED1 P6_13
-    LED2 = P6_14,
+#define LED2 P6_14
-    LED3 = P6_15,
+#define LED3 P6_15
-    LED4 = P6_12,
+#define LED4 P6_12
 
     LED_RED  = LED1,
     LED_GREEN= LED2,
@@ -62,37 +62,32 @@ typedef enum {
     CONSOLE_TX = P6_3,
     CONSOLE_RX = P6_2,
 
-    // Arduiono Pin Names
+#ifdef TARGET_FF_ARDUINO_UNO
-    D0 = P2_15,
+    // Arduino Pin Names
-    D1 = P2_14,
+    ARDUINO_UNO_D0 = P2_15,
-    D2 = P4_7,
+    ARDUINO_UNO_D1 = P2_14,
-    D3 = P4_6,
+    ARDUINO_UNO_D2 = P4_7,
-    D4 = P4_5,
+    ARDUINO_UNO_D3 = P4_6,
-    D5 = P4_4,
+    ARDUINO_UNO_D4 = P4_5,
-    D6 = P8_13,
+    ARDUINO_UNO_D5 = P4_4,
-    D7 = P8_11,
+    ARDUINO_UNO_D6 = P8_13,
-    D8 = P8_15,
+    ARDUINO_UNO_D7 = P8_11,
-    D9 = P8_14,
+    ARDUINO_UNO_D8 = P8_15,
-    D10 = P10_13,
+    ARDUINO_UNO_D9 = P8_14,
-    D11 = P10_14,
+    ARDUINO_UNO_D10 = P10_13,
-    D12 = P10_15,
+    ARDUINO_UNO_D11 = P10_14,
-    D13 = P10_12,
+    ARDUINO_UNO_D12 = P10_15,
-    D14 = P1_3,
+    ARDUINO_UNO_D13 = P10_12,
-    D15 = P1_2,
+    ARDUINO_UNO_D14 = P1_3,
+    ARDUINO_UNO_D15 = P1_2,
 
-    A0 = P1_8,
+    ARDUINO_UNO_A0 = P1_8,
-    A1 = P1_9,
+    ARDUINO_UNO_A1 = P1_9,
-    A2 = P1_10,
+    ARDUINO_UNO_A2 = P1_10,
-    A3 = P1_11,
+    ARDUINO_UNO_A3 = P1_11,
-    A4 = P1_13,
+    ARDUINO_UNO_A4 = P1_13,
-    A5 = P1_15,
+    ARDUINO_UNO_A5 = P1_15,
-
+#endif
-    I2C_SCL = D15,
-    I2C_SDA = D14,
-
-    USER_BUTTON0 = P6_0,
-    // Standardized button names
-    BUTTON1 = USER_BUTTON0,
 
     // Not connected
     NC = (int)0xFFFFFFFF

targets/cmsis_mcu_descriptions.json5

@@ -1261,6 +1261,78 @@
         "sub_family": "EFR32MG12P332",
         "vendor": "Silicon Labs:21"
     },
+    "GD32F307VG": {
+        "algorithms": [
+            {
+                "default": true,
+                "file_name": "Flash/GD32F30x_CL.FLM",
+                "ram_size": null,
+                "ram_start": null,
+                "size": 1048576,
+                "start": 134217728,
+                "style": "Keil"
+            }
+        ],
+        "family": "GD32F30x Series",
+        "from_pack": {
+            "pack": "GD32F30x_DFP",
+            "url": "https://gd32mcu.com/data/documents/pack/",
+            "vendor": "GigaDevice",
+            "version": "2.2.1"
+        },
+        "memories": {
+            "IRAM1": {
+                "access": {
+                    "execute": false,
+                    "non_secure": false,
+                    "non_secure_callable": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": true
+                },
+                "default": true,
+                "p_name": null,
+                "size": 98304,
+                "start": 536870912,
+                "startup": false
+            },
+            "IROM1": {
+                "access": {
+                    "execute": true,
+                    "non_secure": false,
+                    "non_secure_callable": false,
+                    "peripheral": false,
+                    "read": true,
+                    "secure": false,
+                    "write": false
+                },
+                "default": true,
+                "p_name": null,
+                "size": 1048576,
+                "start": 134217728,
+                "startup": true
+            }
+        },
+        "name": "GD32F307VG",
+        "processors": [
+            {
+                "address": null,
+                "ap": 0,
+                "apid": null,
+                "core": "CortexM4",
+                "default_reset_sequence": null,
+                "dp": 0,
+                "fpu": "SinglePrecision",
+                "mpu": "Present",
+                "name": null,
+                "svd": "SVD/GD32F30x_CL.svd",
+                "unit": 0
+            }
+        ],
+        "sub_family": "GD32F307",
+        "vendor": "GigaDevice:123"
+    },
     "GD32F450ZI": {
         "algorithms": [
             {

targets/targets.json5

@@ -768,7 +768,7 @@
     },
     "KW41Z": {
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "core": "Cortex-M0+",
         "supported_toolchains": [
@@ -6103,7 +6103,7 @@
             "RZ_A1XX"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "extra_labels_add": [
             "RZA1H",
@@ -6695,7 +6695,7 @@
     },
     "MCU_EFM32_GECKO": { // Family target for EFM32 Gecko MCUs
         "inherits": [
-            "Target"
+            "EFM32"
         ],
         "device_has": [
             "ANALOGIN",
@@ -8814,7 +8814,7 @@
             "CYW43XXX"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "device_has_remove": [
             "ANALOGOUT"
@@ -8902,7 +8902,7 @@
             "CYW43XXX",
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "extra_labels_add": [
             "PSOC6_01",
@@ -8949,7 +8949,7 @@
             "USBDEVICE"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "extra_labels_add": [
             "PSOC6_01",
@@ -8988,7 +8988,7 @@
             "BLE"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "components_add": [
             "WHD",
@@ -9042,7 +9042,7 @@
             "BLE"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "components_add": [
             "WHD",
@@ -9086,7 +9086,7 @@
             "MCU_PSOC6_M4"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "features": [
             "BLE"
@@ -9140,7 +9140,7 @@
             "MCU_PSOC6_M4"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "features_add": [
             "BLE",
@@ -9251,7 +9251,7 @@
             "GD32_Target"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "core": "Cortex-M4F",
         "extra_labels_add": [
@@ -9286,6 +9286,7 @@
         "overrides": {
             "network-default-interface-type": "ETHERNET"
         },
+        "device_name": "GD32F307VG",
         "image_url": "https://os.mbed.com/media/uploads/Ray_Chen/307-1.png"
     },
     "GD32_F450ZI": {
@@ -9293,7 +9294,7 @@
             "GD32_Target"
         ],
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "core": "Cortex-M4F",
         "extra_labels_add": [