M2351: Support custom board

ccli8 · ccli8 · commit 427e8eb777c0 · 2020-03-20T09:39:16.000+08:00
1. Introduce MCU_M2351 target to be inheritable
2. Re-organize PinNames.h to be overridable
3. Enable configurability of USB/STDIO UART pins
diff --git a/targets/TARGET_NUVOTON/TARGET_M2351/PeripheralNames.h b/targets/TARGET_NUVOTON/TARGET_M2351/PeripheralNames.h
@@ -18,6 +18,7 @@
 #define MBED_PERIPHERALNAMES_H
 
 #include "cmsis.h"
+#include "PinNames.h"
 #include "partition_M2351.h"
 
 #ifdef __cplusplus
@@ -181,7 +182,16 @@ typedef enum {
 #endif
 
     // NOTE: board-specific
-    STDIO_UART  = UART_0,
+#if defined(MBED_CONF_TARGET_USB_UART)
+    USB_UART    = MBED_CONF_TARGET_USB_UART,
+#else
+    USB_UART    = NC,
+#endif
+#if defined(MBED_CONF_TARGET_STDIO_UART)
+    STDIO_UART  = MBED_CONF_TARGET_STDIO_UART,
+#else
+    STDIO_UART  = USB_UART,
+#endif
 
 } UARTName;
 
diff --git a/targets/TARGET_NUVOTON/TARGET_M2351/PinNamesCommon.h b/targets/TARGET_NUVOTON/TARGET_M2351/PinNamesCommon.h
@@ -1,5 +1,7 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2017-2018 Nuvoton
+/*
+ * Copyright (c) 2020, Nuvoton Technology Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef MBED_PINNAMES_H
-#define MBED_PINNAMES_H
+#ifndef __PIN_NAMES_COMMON_H__
+#define __PIN_NAMES_COMMON_H__
 
 #include "cmsis.h"
 #include "partition_M2351.h"
@@ -44,7 +46,7 @@ extern "C" {
 __STATIC_INLINE GPIO_T *NU_PORT_BASE(uint32_t PORT)
 {
     uint32_t port_base = ((uint32_t) GPIOA_BASE) + 0x40 * PORT;
-    
+
 #if defined(SCU_INIT_IONSSET_VAL)
     if (SCU_INIT_IONSSET_VAL & (1 << (PORT + 0))) {
         port_base += NS_OFFSET;
@@ -65,7 +67,7 @@ __STATIC_INLINE uint32_t NU_GET_GPIO_PIN_DATA(uint32_t PORT, uint32_t PIN)
         return GPIO_PIN_DATA_NS(PORT, PIN);
     } 
 #endif
-    
+
     return GPIO_PIN_DATA_S(PORT, PIN);
 }
 
@@ -78,7 +80,7 @@ __STATIC_INLINE void NU_SET_GPIO_PIN_DATA(uint32_t PORT, uint32_t PIN, uint32_t
         return;
     }
 #endif
-    
+
     GPIO_PIN_DATA_S(PORT, PIN) = VALUE;
 }
 
@@ -98,88 +100,19 @@ typedef enum {
     PullNone = 0,
     PullDown,
     PullUp,
-    
+
     /* I/O mode */
     InputOnly,
     PushPullOutput,
     OpenDrain,
     QuasiBidirectional,
-    
+
     /* Default input pull mode */
     PullDefault = PullUp
 } PinMode;
 
-typedef enum {
-    // Not connected
-    NC = (int)0xFFFFFFFF,
-    
-    // Generic naming
-    PA_0    = NU_PORT_N_PIN_TO_PINNAME(0, 0), PA_1, PA_2, PA_3, PA_4, PA_5, PA_6, PA_7, PA_8, PA_9, PA_10, PA_11, PA_12, PA_13, PA_14, PA_15,
-    PB_0    = NU_PORT_N_PIN_TO_PINNAME(1, 0), PB_1, PB_2, PB_3, PB_4, PB_5, PB_6, PB_7, PB_8, PB_9, PB_10, PB_11, PB_12, PB_13, PB_14, PB_15,
-    PC_0    = NU_PORT_N_PIN_TO_PINNAME(2, 0), PC_1, PC_2, PC_3, PC_4, PC_5, PC_6, PC_7, PC_8, PC_9, PC_10, PC_11, PC_12, PC_13,
-    PD_0    = NU_PORT_N_PIN_TO_PINNAME(3, 0), PD_1, PD_2, PD_3, PD_4, PD_5, PD_6, PD_7, PD_8, PD_9, PD_10, PD_11, PD_12, PD_13, PD_14,
-    PE_0    = NU_PORT_N_PIN_TO_PINNAME(4, 0), PE_1, PE_2, PE_3, PE_4, PE_5, PE_6, PE_7, PE_8, PE_9, PE_10, PE_11, PE_12, PE_13, PE_14, PE_15,
-    PF_0    = NU_PORT_N_PIN_TO_PINNAME(5, 0), PF_1, PF_2, PF_3, PF_4, PF_5, PF_6, PF_7, PF_8, PF_9, PF_10, PF_11,
-    PG_0    = NU_PORT_N_PIN_TO_PINNAME(6, 0), PG_1, PG_2, PG_3, PG_4, PG_5, PG_6, PG_7, PG_8, PG_9, PG_10, PG_11, PG_12, PG_13, PG_14, PG_15,
-    PH_0    = NU_PORT_N_PIN_TO_PINNAME(7, 0), PH_1, PH_2, PH_3, PH_4, PH_5, PH_6, PH_7, PH_8, PH_9, PH_10, PH_11,
-   
-    // Arduino UNO naming
-    A0 = PB_11,
-    A1 = PB_10,
-    A2 = PB_9,
-    A3 = PB_8,
-    A4 = PB_4,
-    A5 = PB_5,
-
-    D0 = PA_8,
-    D1 = PA_9,
-    D2 = PB_7,
-    D3 = PB_6,
-    D4 = PB_3,
-    D5 = PB_2,
-    D6 = PC_12,
-    D7 = PC_11,
-    D8 = PC_9,
-    D9 = PC_10,
-    D10 = PF_9,
-    D11 = PF_6,
-    D12 = PF_7,
-    D13 = PF_8,
-    D14 = PG_3,
-    D15 = PG_2,
-    
-    // Other board-specific naming
-    
-    // UART naming
-    USBTX = PB_13,
-    USBRX = PB_12,
-    STDIO_UART_TX   = USBTX,
-    STDIO_UART_RX   = USBRX,
-    
-    // I2C naming
-    I2C_SCL = D15,
-    I2C_SDA = D14,
-    
-    // LED naming
-    LED1 = PA_10,
-    LED2 = PA_11,
-    LED3 = PA_10,  // No real LED. Just for passing ATS.
-    LED4 = PA_11,  // No real LED. Just for passing ATS.
-    LED_GREEN = LED1,
-    
-    // Button naming
-    SW2 = PB_0,
-    SW3 = PB_1,
-    BUTTON1 = SW2,
-    BUTTON2 = SW3,
-
-    // Force PinName to 32-bit required by NU_PINNAME_BIND(...)
-    FORCE_ENUM_PINNAME_32BIT = 0x7FFFFFFF,
-
-} PinName;
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif // MBED_PINNAMES_H
+#endif // __PIN_NAMES_COMMON_H__
diff --git a/targets/TARGET_NUVOTON/TARGET_M2351/TARGET_NU_PFM_M2351/PinNames.h b/targets/TARGET_NUVOTON/TARGET_M2351/TARGET_NU_PFM_M2351/PinNames.h
@@ -0,0 +1,116 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2017-2018 Nuvoton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_PINNAMES_H
+#define MBED_PINNAMES_H
+
+#include "cmsis.h"
+#include "PinNamesCommon.h"
+#include "partition_M2351.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    // Not connected
+    NC = (int)0xFFFFFFFF,
+
+    // Generic naming
+    PA_0    = NU_PORT_N_PIN_TO_PINNAME(0, 0), PA_1, PA_2, PA_3, PA_4, PA_5, PA_6, PA_7, PA_8, PA_9, PA_10, PA_11, PA_12, PA_13, PA_14, PA_15,
+    PB_0    = NU_PORT_N_PIN_TO_PINNAME(1, 0), PB_1, PB_2, PB_3, PB_4, PB_5, PB_6, PB_7, PB_8, PB_9, PB_10, PB_11, PB_12, PB_13, PB_14, PB_15,
+    PC_0    = NU_PORT_N_PIN_TO_PINNAME(2, 0), PC_1, PC_2, PC_3, PC_4, PC_5, PC_6, PC_7, PC_8, PC_9, PC_10, PC_11, PC_12, PC_13,
+    PD_0    = NU_PORT_N_PIN_TO_PINNAME(3, 0), PD_1, PD_2, PD_3, PD_4, PD_5, PD_6, PD_7, PD_8, PD_9, PD_10, PD_11, PD_12, PD_13, PD_14,
+    PE_0    = NU_PORT_N_PIN_TO_PINNAME(4, 0), PE_1, PE_2, PE_3, PE_4, PE_5, PE_6, PE_7, PE_8, PE_9, PE_10, PE_11, PE_12, PE_13, PE_14, PE_15,
+    PF_0    = NU_PORT_N_PIN_TO_PINNAME(5, 0), PF_1, PF_2, PF_3, PF_4, PF_5, PF_6, PF_7, PF_8, PF_9, PF_10, PF_11,
+    PG_0    = NU_PORT_N_PIN_TO_PINNAME(6, 0), PG_1, PG_2, PG_3, PG_4, PG_5, PG_6, PG_7, PG_8, PG_9, PG_10, PG_11, PG_12, PG_13, PG_14, PG_15,
+    PH_0    = NU_PORT_N_PIN_TO_PINNAME(7, 0), PH_1, PH_2, PH_3, PH_4, PH_5, PH_6, PH_7, PH_8, PH_9, PH_10, PH_11,
+
+    // Arduino UNO naming
+    A0 = PB_11,
+    A1 = PB_10,
+    A2 = PB_9,
+    A3 = PB_8,
+    A4 = PB_4,
+    A5 = PB_5,
+
+    D0 = PA_8,
+    D1 = PA_9,
+    D2 = PB_7,
+    D3 = PB_6,
+    D4 = PB_3,
+    D5 = PB_2,
+    D6 = PC_12,
+    D7 = PC_11,
+    D8 = PC_9,
+    D9 = PC_10,
+    D10 = PF_9,
+    D11 = PF_6,
+    D12 = PF_7,
+    D13 = PF_8,
+    D14 = PG_3,
+    D15 = PG_2,
+
+    // Other board-specific naming
+
+    // UART naming
+#if defined(MBED_CONF_TARGET_USB_UART_TX)
+    USBTX           = MBED_CONF_TARGET_USB_UART_TX,
+#else
+    USBTX           = NC,
+#endif
+#if defined(MBED_CONF_TARGET_USB_UART_RX)
+    USBRX           = MBED_CONF_TARGET_USB_UART_RX,
+#else
+    USBRX           = NC,
+#endif
+#if defined(MBED_CONF_TARGET_STDIO_UART_TX)
+    STDIO_UART_TX   = MBED_CONF_TARGET_STDIO_UART_TX,
+#else
+    STDIO_UART_TX   = USBTX,
+#endif
+#if defined(MBED_CONF_TARGET_STDIO_UART_RX)
+    STDIO_UART_RX   = MBED_CONF_TARGET_STDIO_UART_RX,
+#else
+    STDIO_UART_RX   = USBRX,
+#endif
+
+    // I2C naming
+    I2C_SCL = D15,
+    I2C_SDA = D14,
+
+    // LED naming
+    LED1 = PA_10,
+    LED2 = PA_11,
+    LED3 = PA_10,  // No real LED. Just for passing ATS.
+    LED4 = PA_11,  // No real LED. Just for passing ATS.
+    LED_GREEN = LED1,
+
+    // Button naming
+    SW2 = PB_0,
+    SW3 = PB_1,
+    BUTTON1 = SW2,
+    BUTTON2 = SW3,
+
+    // Force PinName to 32-bit required by NU_PINNAME_BIND(...)
+    FORCE_ENUM_PINNAME_32BIT = 0x7FFFFFFF,
+
+} PinName;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // MBED_PINNAMES_H
diff --git a/targets/targets.json b/targets/targets.json
@@ -13142,12 +13142,12 @@
             "MPU"
         ]
     },
-    "NU_PFM_M2351": {
+    "MCU_M2351": {
         "default_toolchain": "ARMC6",
+        "public": false,
         "extra_labels": [
             "NUVOTON",
             "M2351",
-            "M2351KIAAEES",
             "FLASH_CMSIS_ALGO"
         ],
         "OUTPUT_EXT": "hex",
@@ -13157,6 +13157,30 @@
         ],
         "is_disk_virtual": true,
         "config": {
+            "usb-uart": {
+                "help": "Configure USB_UART. USB_UART and USB_UART_TX/USB_UART_RX must be consistent.",
+                "value": null
+            },
+            "usb-uart-tx": {
+                "help": "Configure USBTX. USB_UART and USBTX/USBRX must be consistent.",
+                "value": null
+            },
+            "usb-uart-rx": {
+                "help": "Configure USBRX. USB_UART and USBTX/USBRX must be consistent.",
+                "value": null
+            },
+            "stdio-uart": {
+                "help": "Configure STDIO_UART. STDIO_UART and STDIO_UART_TX/STDIO_UART_RX must be consistent. STDIO_UART defaults to USB_UART.",
+                "value": null
+            },
+            "stdio-uart-tx": {
+                "help": "Configure STDIO_UART_TX. STDIO_UART and STDIO_UART_TX/STDIO_UART_RX must be consistent. STDIO_UART_TX defaults to USBTX.",
+                "value": null
+            },
+            "stdio-uart-rx": {
+                "help": "Configure STDIO_UART_RX. STDIO_UART and STDIO_UART_TX/STDIO_UART_RX must be consistent. STDIO_UART_RX defaults to USBRX.",
+                "value": null
+            },
             "gpio-irq-debounce-enable": {
                 "help": "Enable GPIO IRQ debounce",
                 "value": 0
@@ -13209,16 +13233,26 @@
             "MPU",
             "USBDEVICE"
         ],
-        "detect_code": [
-            "1305"
-        ],
         "release_versions": [
             "5"
         ],
-        "device_name": "M2351KIAAEES",
         "bootloader_supported": true,
-        "forced_reset_timeout": 3,
-        "public": false
+        "forced_reset_timeout": 3
+    },
+    "NU_PFM_M2351": {
+        "inherits": [
+            "MCU_M2351"
+        ],
+        "detect_code": [
+            "1305"
+        ],
+        "device_name": "M2351KIAAEES",
+        "public": false,
+        "overrides": {
+            "usb-uart": "UART_0",
+            "usb-uart-tx": "PB_13",
+            "usb-uart-rx": "PB_12"
+        }
     },
     "NU_PFM_M2351_NPSA_NS": {
         "inherits": [
