Merge branch 'master' into freedomKL05

Conflicts:
	workspace_tools/targets.py
	workspace_tools/tests.py

README.md

@@ -20,11 +20,19 @@ Documentation
 
 Supported Microcontrollers
 --------------------------
-* [NXP LPC1768](http://mbed.org/handbook/mbed-NXP-LPC1768) (Cortex-M3)
-* [NXP LPC111U24](http://mbed.org/handbook/mbed-NXP-LPC11U24) (Cortex-M0)
-* NXP LPC2368 (ARM7TDMI-S)
-* NXP LPC812 (Cortex-M0+)
-* [Freescale KL25Z](http://mbed.org/handbook/mbed-FRDM-KL25Z) (Cortex-M0+)
+NXP:
+* [LPC1768](http://mbed.org/handbook/mbed-NXP-LPC1768) (Cortex-M3)
+* [LPC111U24](http://mbed.org/handbook/mbed-NXP-LPC11U24) (Cortex-M0)
+* LPC2368 (ARM7TDMI-S)
+* LPC812 (Cortex-M0+)
+* LPC4088 (Cortex-M4)
+* LPC4330 (Cortex-M4 + Cortex-M0)
+
+Freescale:
+* [KL25Z](http://mbed.org/handbook/mbed-FRDM-KL25Z) (Cortex-M0+)
+
+STMicroelectronics:
+* STM32F407 (Cortex-M4)
 
 Supported Toolchains and IDEs
 -----------------------------
@@ -43,3 +51,11 @@ API Documentation
 * [DSP API](http://mbed.org/users/mbed_official/code/mbed-dsp/docs/tip/)
 * Flash File Systems: [SD](http://mbed.org/handbook/SDFileSystem), [USB MSD](http://mbed.org/handbook/USBHostMSD), [semihosted](http://mbed.org/handbook/LocalFileSystem)
 * [Peripheral Drivers API](http://mbed.org/handbook/Homepage)
+
+Community
+---------
+For discussing the development of the mbed SDK itself (Addition/support of microcontrollers/toolchains, build and test system, Hardware Abstraction Layer API, etc) please join our [mbed-devel mailing list](https://groups.google.com/forum/?fromgroups#!forum/mbed-devel).
+
+For every topic regarding the use of the mbed SDK, rather than its development, please post on the [mbed.org forum](http://mbed.org/forum/), or the [mbed.org Q&A](http://mbed.org/questions/).
+
+For reporting issues in the mbed libraries please open a ticket on the issue tracker of the relevant [mbed official library](http://mbed.org/users/mbed_official/code/).

libraries/mbed/common/pinmap_common.c

@@ -22,6 +22,9 @@ void pinmap_pinout(PinName pin, const PinMap *map) {
     while (map->pin != NC) {
         if (map->pin == pin) {
             pin_function(pin, map->function);
+#if defined(TARGET_STM32F407)
+            pin_alternate_function(pin, map->alternate_function);
+#endif
             pin_mode(pin, PullNone);
             return;
         }

libraries/mbed/common/stdio.cpp

@@ -379,6 +379,3 @@ namespace __gnu_cxx {
     }
 }
 #endif
-
-// Make sure we are pulling in the retargeting module at link time
-volatile int stdio_retargeting_module;

libraries/mbed/hal/pinmap.h

@@ -26,9 +26,15 @@ typedef struct {
     PinName pin;
     int peripheral;
     int function;
+#if defined(TARGET_STM32F407)
+    int alternate_function;
+#endif
 } PinMap;
 
 void pin_function(PinName pin, int function);
+# if defined(TARGET_STM32F407) 
+void pin_alternate_function(PinName pin, int alternate_function);
+#endif
 void pin_mode    (PinName pin, PinMode mode);
 
 uint32_t pinmap_peripheral(PinName pin, const PinMap* map);