Update branch from mbed master

	- merge branch 'master' into dev_target_k64f

Conflicts:
	libraries/USBDevice/USBDevice/USBEndpoints.h
	libraries/USBDevice/USBDevice/USBHAL_KL25Z.cpp
	workspace_tools/export/uvision4.py
	workspace_tools/targets.py

Author: 0xc0170

README.md

@@ -1,5 +1,5 @@
-mbed SDK 
-======== 
+mbed SDK
+========
 
 [![Build Status](https://travis-ci.org/mbedmicro/mbed.png)](https://travis-ci.org/mbedmicro/mbed/builds)
 
@@ -20,30 +20,39 @@ Documentation
 * [mbed library internals](http://mbed.org/handbook/mbed-library-internals)
 * [Adding a new target microcontroller](http://mbed.org/handbook/mbed-SDK-porting)
 
-Supported Microcontrollers
---------------------------
+Supported Microcontrollers and Boards
+-------------------------------------
 NXP:
-* [LPC1768](http://mbed.org/platforms/mbed-LPC1768/) (Cortex-M3)
-* [LPC1768](http://mbed.org/platforms/u-blox-C027/) (Cortex-M3)
-* [LPC11U24](http://mbed.org/platforms/mbed-LPC11U24/) (Cortex-M0)
-* [LPC11U35](http://mbed.org/platforms/EA-LPC11U35/) (Cortex-M0)
-* LPC2368 (ARM7TDMI-S)
+* [mbed LPC1768](http://mbed.org/platforms/mbed-LPC1768/) (Cortex-M3)
+* [u-blox C027 LPC1768](http://mbed.org/platforms/u-blox-C027/) (Cortex-M3)
+* [mbed LPC11U24](http://mbed.org/platforms/mbed-LPC11U24/) (Cortex-M0)
+* [EA LPC11U35](http://mbed.org/platforms/EA-LPC11U35/) (Cortex-M0)
+* mbed LPC2368 (ARM7TDMI-S)
 * LPC810 (Cortex-M0+)
 * [LPC812](http://mbed.org/platforms/NXP-LPC800-MAX/) (Cortex-M0+)
-* [LPC4088](http://mbed.org/platforms/EA-LPC4088/) (Cortex-M4)
+* [EA LPC4088](http://mbed.org/platforms/EA-LPC4088/) (Cortex-M4)
 * LPC4330 (Cortex-M4 + Cortex-M0)
 * [LPC1347](http://mbed.org/platforms/DipCortex-M3/) (Cortex-M3)
 * [LPC1114](http://mbed.org/platforms/LPC1114FN28/) (Cortex-M0)
 * LPC11C24 (Cortex-M0)
+* [LPC1549](https://mbed.org/platforms/LPCXpresso1549/) (Cortex-M3)
 
 Freescale:
-* KL05Z (Cortex-M0+)
-* [KL25Z](http://mbed.org/platforms/KL25Z/) (Cortex-M0+)
-* [KL46Z](https://mbed.org/platforms/FRDM-KL46Z/) (Cortex-M0+)
+* FRDM-K20D50M
+* [FRDM-KL05Z](https://mbed.org/platforms/FRDM-KL05Z/) (Cortex-M0+)
+* [FRDM-KL25Z](http://mbed.org/platforms/KL25Z/) (Cortex-M0+)
+* [FRDM-KL46Z](https://mbed.org/platforms/FRDM-KL46Z/) (Cortex-M0+)
 
 STMicroelectronics:
+* [Nucleo-F103RB](https://mbed.org/platforms/ST-Nucleo-F103RB/) (Cortex-M3)
+* [Nucleo-L152RE](https://mbed.org/platforms/ST-Nucleo-L152RE/) (Cortex-M3)
+* [Nucleo-F030R8](https://mbed.org/platforms/ST-Nucleo-F030R8/) (Cortex-M0)
+* [Nucleo-F401RE](https://mbed.org/platforms/ST-Nucleo-F401RE/) (Cortex-M4)
 * STM32F407 (Cortex-M4)
 
+Nordic:
+* [nRF51822-mKIT](https://mbed.org/platforms/Nordic-nRF51822/) (Cortex-M0)
+
 Supported Toolchains and IDEs
 -----------------------------
 * GCC ARM: [GNU Tools for ARM Embedded Processors](https://launchpad.net/gcc-arm-embedded/4.7/4.7-2012-q4-major)

libraries/USBDevice/USBDevice/USBDevice.cpp

@@ -703,12 +703,15 @@ bool USBDevice::configured(void)
     return (device.state == CONFIGURED);
 }
 
-void USBDevice::connect(void)
+void USBDevice::connect(bool blocking)
 {
     /* Connect device */
     USBHAL::connect();
-    /* Block if not configured */
-    while (!configured());
+    
+    if (blocking) {
+        /* Block if not configured */
+        while (!configured());
+    }
 }
 
 void USBDevice::disconnect(void)

libraries/USBDevice/USBDevice/USBDevice.h

@@ -37,8 +37,10 @@ class USBDevice: public USBHAL
 
     /*
     * Connect a device
+    * 
+    * @param blocking: block if not configured
     */
-    void connect(void);
+    void connect(bool blocking = true);
 
     /*
     * Disconnect a device

libraries/USBDevice/USBDevice/USBEndpoints.h

@@ -41,7 +41,7 @@ typedef enum {
 #include "USBEndpoints_LPC17_LPC23.h"
 #elif defined(TARGET_LPC11UXX) || defined(TARGET_LPC1347)
 #include "USBEndpoints_LPC11U.h"
-#elif defined(TARGET_KL25Z) | defined(TARGET_K64F)
+#elif defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M) | defined(TARGET_K64F)
 #include "USBEndpoints_KL25Z.h"
 #elif defined (TARGET_STM32F4XX)
 #include "USBEndpoints_STM32F4.h"

libraries/USBDevice/USBDevice/USBHAL_KL25Z.cpp

@@ -16,7 +16,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#if defined(TARGET_KL25Z) | defined(TARGET_K64F)
+#if defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M) | defined(TARGET_K64F)
 
 #include "USBHAL.h"
 

libraries/USBDevice/USBMSD/USBMSD.cpp

@@ -103,8 +103,7 @@ bool USBMSD::USBCallback_request(void) {
 }
 
 
-bool USBMSD::connect() {
-
+bool USBMSD::connect(bool blocking) {
     //disk initialization
     if (disk_status() & NO_INIT) {
         if (disk_initialize()) {
@@ -131,7 +130,7 @@ bool USBMSD::connect() {
     }
 
     //connect the device
-    USBDevice::connect();
+    USBDevice::connect(blocking);
     return true;
 }
 

libraries/USBDevice/USBMSD/USBMSD.h

@@ -70,9 +70,10 @@ class USBMSD: public USBDevice {
     /**
     * Connect the USB MSD device. Establish disk initialization before really connect the device.
     *
+    * @param blocking if not configured
     * @returns true if successful
     */
-    bool connect();
+    bool connect(bool blocking = true);
 
     /**
     * Disconnect the USB MSD device.

libraries/USBDevice/USBSerial/USBCDC.cpp

@@ -29,9 +29,9 @@ static uint8_t cdc_line_coding[7]= {0x80, 0x25, 0x00, 0x00, 0x00, 0x00, 0x08};
 
 #define MAX_CDC_REPORT_SIZE MAX_PACKET_SIZE_EPBULK
 
-USBCDC::USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release): USBDevice(vendor_id, product_id, product_release) {
+USBCDC::USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release, bool connect_blocking): USBDevice(vendor_id, product_id, product_release) {
     terminal_connected = false;
-    USBDevice::connect();
+    USBDevice::connect(connect_blocking);
 }
 
 bool USBCDC::USBCallback_request(void) {

libraries/USBDevice/USBSerial/USBCDC.h

@@ -35,8 +35,9 @@ class USBCDC: public USBDevice {
     * @param vendor_id Your vendor_id
     * @param product_id Your product_id
     * @param product_release Your preoduct_release
+    * @param connect_blocking define if the connection must be blocked if USB not plugged in
     */
-    USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release);
+    USBCDC(uint16_t vendor_id, uint16_t product_id, uint16_t product_release, bool connect_blocking);
 
 protected:
 

libraries/USBDevice/USBSerial/USBSerial.h

@@ -53,9 +53,10 @@ class USBSerial: public USBCDC, public Stream {
     * @param vendor_id Your vendor_id (default: 0x1f00)
     * @param product_id Your product_id (default: 0x2012)
     * @param product_release Your preoduct_release (default: 0x0001)
+    * @param connect_blocking define if the connection must be blocked if USB not plugged in
     *
     */
-    USBSerial(uint16_t vendor_id = 0x1f00, uint16_t product_id = 0x2012, uint16_t product_release = 0x0001): USBCDC(vendor_id, product_id, product_release), buf(128){
+    USBSerial(uint16_t vendor_id = 0x1f00, uint16_t product_id = 0x2012, uint16_t product_release = 0x0001, bool connect_blocking = true): USBCDC(vendor_id, product_id, product_release, connect_blocking), buf(128){
         settingsChangedCallback = 0;
     };