Merge remote-tracking branch 'ARMmbed/master' into pr/psoc6-hal

Author: vmedcy

TESTS/mbed_hal_fpga_ci_test_shield/analogout/main.cpp

@@ -18,6 +18,7 @@
 #include "fsl_emc.h"
 #include "fsl_power.h"
 #include "fsl_flashiap.h"
+#include "hal/pinmap.h"
 
 #define CRC16
 #include "crc.h"
@@ -186,3 +187,17 @@ uint32_t qspi_get_freq(void)
     return CLOCK_GetFroHfFreq();
 }
 
+const PinList *pinmap_restricted_pins()
+{
+    /* D6 pin is used by the LCD
+       A4 pin is used by the accelerometer */
+    static const PinName pins[] = {
+        D6, A4
+    };
+    static const PinList pin_list = {
+        sizeof(pins) / sizeof(pins[0]),
+        pins
+    };
+    return &pin_list;
+}
+

targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MCU_LPC546XX/TARGET_LPCXpresso/mbed_overrides.c

@@ -35,18 +35,18 @@
             },
             "linux": {
                 "MIMode": "gdb",
-                "MIDebuggerPath": "/usr/bin/arm-none-eabi-gdb",
+                "MIDebuggerPath": "arm-none-eabi-gdb",
                 "debugServerPath": "pyocd-gdbserver"
             },
             "osx": {
                 "MIMode": "gdb",
-                "MIDebuggerPath": "/usr/local/bin/arm-none-eabi-gdb",
+                "MIDebuggerPath": "arm-none-eabi-gdb",
                 "debugServerPath": "pyocd-gdbserver"
             },
             "windows": {
                 "preLaunchTask": "make.exe",
                 "MIMode": "gdb",
-                "MIDebuggerPath": "C:\\Program Files (x86)\\GNU Tools ARM Embedded\\6 2017-q1-update\\bin\\arm-none-eabi-gdb.exe",
+                "MIDebuggerPath": "arm-none-eabi-gdb.exe",
                 "debugServerPath": "pyocd-gdbserver.exe",
                 "setupCommands": [
                     { "text": "-environment-cd ${workspaceRoot}\\BUILD" },