Merge branch 'master' into freedomKL05

Conflicts:
	workspace_tools/toolchains/arm.py

Author: 0xc0170

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/MKL25Z4.h renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/MKL25Z4.h

@@ -265,7 +265,9 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
         }
     }
 
-    i2c_clear_SI(obj);
+    // clearing the serial interrupt here might cause an unintended rewrite of the last byte
+    // see also issue report https://mbed.org/users/mbed_official/code/mbed/issues/1
+    // i2c_clear_SI(obj);
 
     // If not repeated start, send stop.
     if (stop) {

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_MICRO/MKL25Z4.sct renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_MICRO/MKL25Z4.sct

@@ -273,7 +273,9 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
         }
     }
 
-    i2c_clear_SI(obj);
+    // clearing the serial interrupt here might cause an unintended rewrite of the last byte
+    // see also issue report https://mbed.org/users/mbed_official/code/mbed/issues/1
+    // i2c_clear_SI(obj);
 
     // If not repeated start, send stop.
     if (stop) {

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_MICRO/startup_MKL25Z4.s renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_MICRO/startup_MKL25Z4.s

@@ -272,7 +272,9 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
         }
     }
 
-    i2c_clear_SI(obj);
+    // clearing the serial interrupt here might cause an unintended rewrite of the last byte
+    // see also issue report https://mbed.org/users/mbed_official/code/mbed/issues/1
+    // i2c_clear_SI(obj);
 
     // If not repeated start, send stop.
     if (stop) {

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_MICRO/sys.cpp renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_MICRO/sys.cpp

@@ -282,7 +282,9 @@ int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) {
         }
     }
 
-    i2c_clear_SI(obj);
+    // clearing the serial interrupt here might cause an unintended rewrite of the last byte
+    // see also issue report https://mbed.org/users/mbed_official/code/mbed/issues/1
+    // i2c_clear_SI(obj);
 
     // If not repeated start, send stop.
     if (stop) {

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_STD/MKL25Z4.sct renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_STD/MKL25Z4.sct

@@ -19,6 +19,6 @@ def get_default_options_parser():
                   help="clean the build directory")
 
     parser.add_option("-o", "--options", action="append",
-                  help='Add a build option ("save-asm": save the asm generated by the compiler)')
+                  help='Add a build option ("save-asm": save the asm generated by the compiler, "debug-info": generate debugging information)')
 
     return parser

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_STD/startup_MKL25Z4.s renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_STD/startup_MKL25Z4.s

@@ -34,7 +34,7 @@ def __init__(self):
 
         self.core = "ARM7TDMI-S"
 
-        self.extra_labels = ['LPC23XX']
+        self.extra_labels = ['NXP', 'LPC23XX']
 
         self.supported_toolchains = ["ARM"]
 
@@ -45,7 +45,7 @@ def __init__(self):
 
         self.core = "Cortex-M3"
 
-        self.extra_labels = ['LPC176X']
+        self.extra_labels = ['NXP', 'LPC176X']
 
         self.supported_toolchains = ["ARM", "GCC_ARM", "GCC_CS", "GCC_CR", "IAR"]
 
@@ -56,7 +56,7 @@ def __init__(self):
 
         self.core = "Cortex-M0"
 
-        self.extra_labels = ['LPC11UXX']
+        self.extra_labels = ['NXP', 'LPC11UXX']
 
         self.supported_toolchains = ["ARM", "uARM"]
 
@@ -78,6 +78,8 @@ def __init__(self):
 
         self.core = "Cortex-M0+"
 
+        self.extra_labels = ['Freescale']
+        
         self.supported_toolchains = ["ARM", "GCC_CW_EWL", "GCC_CW_NEWLIB"]
 
         self.program_cycle_s = 4
@@ -89,7 +91,7 @@ def __init__(self):
 
         self.core = "Cortex-M0+"
 
-        self.extra_labels = ['LPC81X']
+        self.extra_labels = ['NXP', 'LPC81X']
 
         self.supported_toolchains = ["uARM"]
 
@@ -102,7 +104,7 @@ def __init__(self):
 
         self.core = "Cortex-M4"
 
-        self.extra_labels = ['LPC408X']
+        self.extra_labels = ['NXP', 'LPC408X']
 
         self.supported_toolchains = ["ARM", "GCC_CR"]
 
@@ -113,7 +115,7 @@ def __init__(self):
 
         self.core = "Cortex-M4"
 
-        self.extra_labels = ['LPC43XX']
+        self.extra_labels = ['NXP', 'LPC43XX']
 
         self.supported_toolchains = ["ARM", "GCC_CR", "IAR"]
 
@@ -122,9 +124,9 @@ def __init__(self):
         Target.__init__(self)
 
         self.core = "Cortex-M4"
-
-        self.extra_labels = ['STM32F4XX']
-
+        
+        self.extra_labels = ['STM', 'STM32F4XX']
+        
         self.supported_toolchains = ["GCC_ARM"]
 
 
@@ -134,6 +136,8 @@ def __init__(self):
 
         self.core = "Cortex-M0+"
 
+        self.extra_labels = ['ARM']
+        
         self.supported_toolchains = ["ARM"]
 
 

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_STD/sys.cpp renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_ARM_STD/sys.cpp

@@ -31,8 +31,9 @@ def __init__(self, target, options=None, notify=None):
 
         if "save-asm" in self.options:
             common.extend(["--asm", "--interleave"])
-        elif "debug-info" in self.options:
-            common.extend(["--debug"])
+
+        if "debug-info" in self.options:
+            common.append("-g")
 
         common_c = [
             "--md", "--no_depend_system_headers",

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_GCC_CW_EWL/MKL25Z4.ld renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_GCC_CW_EWL/MKL25Z4.ld

@@ -39,6 +39,9 @@ def __init__(self, target, options=None, notify=None, tool_path=""):
 
         if "save-asm" in self.options:
             common_flags.append("-save-temps")
+
+        if "debug-info" in self.options:
+            common_flags.append("-g")
 
         self.asm = [join(tool_path, "arm-none-eabi-as")] + self.cpu
 

libraries/mbed/targets/cmsis/Freescale/TARGET_KL25Z/TOOLCHAIN_GCC_CW_EWL/startup_MKL25Z4.c renamed to libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/TOOLCHAIN_GCC_CW_EWL/startup_MKL25Z4.c

@@ -28,6 +28,9 @@ def __init__(self, target, options=None, notify=None):
             # Pa082: Operation involving two values from two registers (ie: (float)(*obj->MR)/(float)(LPC_PWM1->MR0))
             "--diag_suppress=Pa050,Pa084,Pa093,Pa082",
         ]
+
+        if "debug-info" in self.options:
+            c_flags.append("-r")
 
         IAR_BIN = join(IAR_PATH, "bin")
         self.asm  = [join(IAR_BIN, "iasmarm")] + ["--cpu", target.core]