From 120c9ad56c8bab7de4cc797efd664c60feaab15e Mon Sep 17 00:00:00 2001
From: "andreas.larsson" <andreas.larsson@connectblue.com>
Date: Mon, 25 Sep 2017 16:47:38 +0200
Subject: [PATCH] Moved STDIO_UART defines to targets.json for
 UBLOX_EVK_ODIN_W2 instead of hardcoded.

---
 .../TARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h  |  5 ++---
 .../TARGET_UBLOX_EVK_ODIN_W2/PinNames.h         |  4 ++--
 targets/targets.json                            | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h
index fb1cdab06b..fcd76d0152 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PeripheralNames.h
@@ -57,9 +57,8 @@ typedef enum {
     UART_8 = (int)UART8_BASE
 } UARTName;
 
-#define STDIO_UART_TX  PA_9
-#define STDIO_UART_RX  PA_10
-#define STDIO_UART     UART_1
+#define STDIO_UART_TX  USBTX
+#define STDIO_UART_RX  USBRX
 
 typedef enum {
     SPI_1 = (int)SPI1_BASE,
diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h
index c4137a2e0f..1be288b161 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_UBLOX_EVK_ODIN_W2/PinNames.h
@@ -166,8 +166,8 @@ typedef enum {
     BUTTON2    = SW1,
 
     // ST-Link
-    USBRX      = PA_10,
-    USBTX      = PA_9,
+    USBRX      = MBED_CONF_TARGET_USB_RX,
+    USBTX      = MBED_CONF_TARGET_USB_TX,
     SWDIO      = PA_15,
     SWCLK      = PA_14,
     NTRST      = PB_4,
diff --git a/targets/targets.json b/targets/targets.json
index 2246affee2..20cbd4aca6 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -1701,7 +1701,22 @@
         "features": ["LWIP"],
         "release_versions": ["5"],
         "device_name": "STM32F439ZI",
-        "bootloader_supported": true
+        "bootloader_supported": true,
+        "config": {
+            "usb_tx": {
+                "help": "Value: D8(default) or D1",
+                "value": "D8"
+            },
+            "usb_rx": {
+                "help": "Value: D2(default) or D0",
+                "value": "D2"
+            },
+            "stdio_uart": {
+                "help": "Value: UART_1(default) or UART_3",
+                "value": "UART_1",
+                "macro_name": "STDIO_UART"
+            }
+        }
     },
     "UBLOX_C030": {
         "inherits": ["FAMILY_STM32"],