Merge branch 'master' of https://github.com/mbedmicro/mbed

bcostm · bcostm · commit 9b588e31064b · 2015-04-24T09:11:18.000+02:00
diff --git a/libraries/mbed/common/pinmap_common.c b/libraries/mbed/common/pinmap_common.c
@@ -86,4 +86,4 @@ uint32_t pinmap_function(PinName pin, const PinMap* map) {
     if ((uint32_t)NC == function) // no mapping available
         error("pinmap not found for function");
     return function;
-}
+}
diff --git a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20XX/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/startup_MK20D5.s b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_K20XX/TARGET_K20D50M/TOOLCHAIN_GCC_ARM/startup_MK20D5.s
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/rtc_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_K20XX/rtc_api.c
diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/PeripheralPins.c b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32600/PeripheralPins.c
@@ -45,6 +45,10 @@
  * the pointers to the "function" data members.
  */
 
+#ifdef TOOLCHAIN_ARM_STD
+#pragma diag_suppress 1296
+#endif
+
 /************I2C***************/
 const PinMap PinMap_I2C_SDA[] = {
     { P2_4,  I2C_0, (int)&((pin_function_t){&MXC_IOMAN->i2cm0_req, &MXC_IOMAN->i2cm0_ack, ((uint32_t)MXC_E_IOMAN_MAPPING_A | MXC_F_IOMAN_I2CM_CORE_IO), (MXC_F_IOMAN_I2CM_MAPPING | MXC_F_IOMAN_I2CM_CORE_IO)}) },
diff --git a/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PeripheralPins.c b/libraries/mbed/targets/hal/TARGET_Maxim/TARGET_MAX32610/PeripheralPins.c
@@ -45,6 +45,10 @@
  * the pointers to the "function" data members.
  */
 
+#ifdef TOOLCHAIN_ARM_STD
+#pragma diag_suppress 1296
+#endif
+
 /************I2C***************/
 const PinMap PinMap_I2C_SDA[] = {
     { P0_4,  I2C_0, (int)&((pin_function_t){&MXC_IOMAN->i2cm0_req, &MXC_IOMAN->i2cm0_ack, ((uint32_t)MXC_E_IOMAN_MAPPING_D | MXC_F_IOMAN_I2CM_CORE_IO), (MXC_F_IOMAN_I2CM_MAPPING | MXC_F_IOMAN_I2CM_CORE_IO)}) },
diff --git a/workspace_tools/build.py b/workspace_tools/build.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
diff --git a/workspace_tools/build_travis.py b/workspace_tools/build_travis.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 """
 Travis-CI build script
diff --git a/workspace_tools/make.py b/workspace_tools/make.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
diff --git a/workspace_tools/singletest.py b/workspace_tools/singletest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 """
 mbed SDK

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#! /usr/bin/env python`
	`1`	`+#! /usr/bin/env python2`
`2`	`2`	`"""`
`3`	`3`	`mbed SDK`
`4`	`4`	`Copyright (c) 2011-2013 ARM Limited`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env python2`
`2`	`2`
`3`	`3`	`"""`
`4`	`4`	`Travis-CI build script`