Skip to content

Commit b396436

Browse files
sg-sg-
authored
Merge pull request #2451 from 0xc0170/test
Fixes from mbed-os-5.1.1
2 parents dd8060b + f38ee3c commit b396436

File tree

126 files changed

+8
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+8
-4
lines changed

‎hal/api/mbed.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#ifndef MBED_H
1717
#define MBED_H
1818

19-
#define MBED_LIBRARY_VERSION 122
19+
#define MBED_LIBRARY_VERSION 123
2020

2121
#if MBED_CONF_RTOS_PRESENT
2222
#include "rtos/rtos.h"

‎hal/targets.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -571,16 +571,16 @@
571571
"inherits": ["Target"],
572572
"core": "Cortex-M4F",
573573
"supported_toolchains": ["ARM", "GCC_ARM"],
574-
"extra_labels": ["Freescale", "KSDK2_MCUS", "K64F", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F"],
574+
"extra_labels": ["Freescale", "KSDK2_MCUS", "KPSDK_MCUS", "KPSDK_CODE", "MCU_K64F"],
575575
"is_disk_virtual": true,
576576
"macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "TARGET_K64F"],
577577
"progen": {"target": "mts-gambit"},
578-
"device_has": ["I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
578+
"device_has": ["I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
579579
},
580580
"HEXIWEAR": {
581581
"inherits": ["Target"],
582582
"core": "Cortex-M4F",
583-
"extra_labels": ["Freescale", "KSDK2_MCUS", "K64F"],
583+
"extra_labels": ["Freescale", "KSDK2_MCUS", "MCU_K64F"],
584584
"supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
585585
"macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "TARGET_K64F"],
586586
"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‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/MK64F12_features.h‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/MK64F12_features.h‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/MK64FN1M0xxx12.sct‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/startup_MK64F12.S‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/startup_MK64F12.S‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_ARM_STD/sys.cpp‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_ARM_STD/sys.cpp‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/MK64FN1M0xxx12.ld‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_GCC_ARM/startup_MK64F12.S‎

File renamed without changes.

‎hal/targets/cmsis/TARGET_Freescale/TARGET_K64F/TOOLCHAIN_IAR/MK64FN1M0xxx12.icf‎ renamed to ‎hal/targets/cmsis/TARGET_Freescale/TARGET_MCU_K64F/TOOLCHAIN_IAR/MK64FN1M0xxx12.icf‎

File renamed without changes.

0 commit comments

Comments
 (0)