Skip to content

Commit

Permalink
Merge pull request #2428 from 0xc0170/fix_k64f_mcu
Browse files Browse the repository at this point in the history
Fix k64f mcu - common code to be shared for k64f derivates
  • Loading branch information
0xc0170 authored Aug 12, 2016
2 parents f4aabc4 + 133d7b3 commit f1fb66c
Show file tree
Hide file tree
Showing 125 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hal/targets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -314,3 +316,5 @@ void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, Pi
}

#endif

#endif

0 comments on commit f1fb66c

Please sign in to comment.