Skip to content

Commit f2e1518

Browse files
author
Bogdan Marinescu
committed
Merge branch 'master' of git://github.com/Sissors/mbed into Sissors-master
Conflicts: libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/analogin_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/analogout_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/gpio_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/i2c_api.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/pinmap.c libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KL05Z/pwmout_api.c
2 parents 2a782f5 + fb3fe60 commit f2e1518

File tree

104 files changed

+701
-3453
lines changed

Some content is hidden

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

104 files changed

+701
-3453
lines changed

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/MKL05Z4.h renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/MKL05Z4.h

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/TOOLCHAIN_ARM_STD/MKL05Z4.sct renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/TOOLCHAIN_ARM_STD/MKL05Z4.sct

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/TOOLCHAIN_ARM_STD/startup_MKL05Z4.s renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/TOOLCHAIN_ARM_STD/startup_MKL05Z4.s

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/TOOLCHAIN_ARM_STD/sys.cpp renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/TOOLCHAIN_ARM_STD/sys.cpp

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/TOOLCHAIN_GCC_ARM/MKL05Z4.ld renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/TOOLCHAIN_GCC_ARM/MKL05Z4.ld

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/TOOLCHAIN_GCC_ARM/startup_MKL05Z4.s renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/TOOLCHAIN_GCC_ARM/startup_MKL05Z4.s

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis.h renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/cmsis.h

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.c renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/cmsis_nvic.c

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.h renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/cmsis_nvic.h

File renamed without changes.

‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/system_MKL05Z4.c renamed to ‎libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KLXX/TARGET_KL05Z/system_MKL05Z4.c

File renamed without changes.

0 commit comments

Comments
 (0)