Merge pull request #2451 from 0xc0170/test

Fixes from mbed-os-5.1.1

Author: sg-

hal/api/mbed.h

@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 122
+#define MBED_LIBRARY_VERSION 123
 
 #if MBED_CONF_RTOS_PRESENT
 #include "rtos/rtos.h"

hal/targets.json

@@ -571,16 +571,16 @@
         "inherits": ["Target"],
         "core": "Cortex-M4F",
         "supported_toolchains": ["ARM", "GCC_ARM"],
-        "extra_labels": ["Freescale", "KSDK2_MCUS", "K64F", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F"],
+        "extra_labels": ["Freescale", "KSDK2_MCUS", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F"],
         "is_disk_virtual": true,
         "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "TARGET_K64F"],
         "progen": {"target": "mts-gambit"},
-        "device_has": ["I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
+        "device_has": ["I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
     },
     "HEXIWEAR": {
         "inherits": ["Target"],
         "core": "Cortex-M4F",
-        "extra_labels": ["Freescale", "KSDK2_MCUS", "K64F"],
+        "extra_labels": ["Freescale", "KSDK2_MCUS", "MCU_K64F"],
         "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
         "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "TARGET_K64F"],
         "is_disk_virtual": true,

hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/MK64F12.h renamed to hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/MK64F12.h

@@ -280,6 +280,8 @@ void serial_break_clear(serial_t *obj) {
     uart_addrs[obj->index]->C2 &= ~UART_C2_SBK_MASK;
 }
 
+#if DEVICE_SERIAL_FC
+
 /*
  * Only hardware flow control is implemented in this API.
  */
@@ -314,3 +316,5 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
 }
 
 #endif
+
+#endif