Skip to content

Commit 8c6ca15

Browse files
committed
Merge branch 'master' of https://github.com/mbedmicro/mbed
2 parents 0f23ed0 + 955bd9a commit 8c6ca15

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
mbed SDK
2-
========
1+
mbed SDK
2+
========
33

44
[![Build Status](https://travis-ci.org/mbedmicro/mbed.png)](https://travis-ci.org/mbedmicro/mbed/builds)
55

@@ -38,6 +38,7 @@ NXP:
3838
* [LPC1549](https://mbed.org/platforms/LPCXpresso1549/) (Cortex-M3)
3939

4040
Freescale:
41+
* FRDM-K20D50M
4142
* [FRDM-KL05Z](https://mbed.org/platforms/FRDM-KL05Z/) (Cortex-M0+)
4243
* [FRDM-KL25Z](http://mbed.org/platforms/KL25Z/) (Cortex-M0+)
4344
* [FRDM-KL46Z](https://mbed.org/platforms/FRDM-KL46Z/) (Cortex-M0+)

libraries/mbed/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 30
19+
#define MBED_LIBRARY_VERSION 80
2020

2121
#include "platform.h"
2222

workspace_tools/export/iar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class IAREmbeddedWorkbench(Exporter):
2121
NAME = 'IAR'
22-
TARGETS = ['LPC1768', 'NUCLEO_F401RE']
22+
TARGETS = ['LPC1768']
2323
TOOLCHAIN = 'IAR'
2424

2525
def generate(self):

workspace_tools/targets.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ def __init__(self):
284284

285285
self.extra_labels = ['STM', 'STM32F1', 'STM32F103RB']
286286

287-
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
287+
self.supported_toolchains = ["ARM", "uARM"]
288288

289289

290290
class NUCLEO_L152RE(Target):
@@ -298,7 +298,7 @@ def __init__(self):
298298

299299
self.extra_labels = ['STM', 'STM32L1', 'STM32L152RE']
300300

301-
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
301+
self.supported_toolchains = ["ARM", "uARM"]
302302

303303

304304
class NUCLEO_F401RE(Target):
@@ -312,7 +312,7 @@ def __init__(self):
312312

313313
self.extra_labels = ['STM', 'STM32F4', 'STM32F401RE']
314314

315-
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
315+
self.supported_toolchains = ["ARM", "uARM"]
316316

317317

318318
class NUCLEO_F030R8(Target):
@@ -326,7 +326,7 @@ def __init__(self):
326326

327327
self.extra_labels = ['STM', 'STM32F0', 'STM32F030R8']
328328

329-
self.supported_toolchains = ["ARM", "uARM", "GCC_ARM"]
329+
self.supported_toolchains = ["ARM", "uARM"]
330330

331331

332332
class LPC1347(Target):

0 commit comments

Comments
 (0)