diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralNames.h
index 2a2ecc6ead..c5005d473c 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralNames.h
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralNames.h
@@ -22,6 +22,10 @@
 extern "C" {
 #endif
 
+typedef enum {
+    GPIO_X = 0, // dummy peripheral used instead of GPIO_A..GPIO_E
+} GPIOName;
+
 typedef enum {
     OSC32KCLK = 0,
 } RTCName;
@@ -32,7 +36,6 @@ typedef enum {
     UART_2 = 2,
     UART_3 = 3,
     UART_4 = 4,
-    UART_5 = 5,
 } UARTName;
 
 #define STDIO_UART_TX     USBTX
@@ -124,7 +127,7 @@ typedef enum {
     DAC_0 = 0
 } DACName;
 
-
+#define DEVICE_SPI_COUNT 3
 typedef enum {
     SPI_0 = 0,
     SPI_1 = 1,
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPinMaps.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPinMaps.h
new file mode 100644
index 0000000000..df1c70475d
--- /dev/null
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPinMaps.h
@@ -0,0 +1,375 @@
+/* mbed Microcontroller Library
+ * Copyright (c) [2020]-[2022], Sigma Delta Technologies Inc.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef MBED_PERIPHERALPINMAPS_H
+#define MBED_PERIPHERALPINMAPS_H
+
+#include <mstd_cstddef>
+
+/************GPIO***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_GPIO[] = {
+    {PTA0, GPIO_X, 1},
+    {PTA1, GPIO_X, 1},
+    {PTA2, GPIO_X, 1},
+    {PTA3, GPIO_X, 1},
+    {PTA4, GPIO_X, 1},
+    {PTA5, GPIO_X, 1},
+    {PTA6, GPIO_X, 1},
+    {PTA7, GPIO_X, 1},
+    {PTA8, GPIO_X, 1},
+    {PTA9, GPIO_X, 1},
+    {PTA10, GPIO_X, 1},
+    {PTA11, GPIO_X, 1},
+    {PTA12, GPIO_X, 1},
+    {PTA13, GPIO_X, 1},
+    {PTA14, GPIO_X, 1},
+    {PTA15, GPIO_X, 1},
+    {PTA16, GPIO_X, 1},
+    {PTA17, GPIO_X, 1},
+    {PTA18, GPIO_X, 1},
+    {PTA19, GPIO_X, 1},
+    {PTA24, GPIO_X, 1},
+    {PTA25, GPIO_X, 1},
+    {PTA26, GPIO_X, 1},
+    {PTA27, GPIO_X, 1},
+    {PTA28, GPIO_X, 1},
+    {PTA29, GPIO_X, 1},
+
+    {PTB0, GPIO_X, 1},
+    {PTB1, GPIO_X, 1},
+    {PTB2, GPIO_X, 1},
+    {PTB3, GPIO_X, 1},
+    {PTB4, GPIO_X, 1},
+    {PTB5, GPIO_X, 1},
+    {PTB6, GPIO_X, 1},
+    {PTB7, GPIO_X, 1},
+    {PTB8, GPIO_X, 1},
+    {PTB9, GPIO_X, 1},
+    {PTB10, GPIO_X, 1},
+    {PTB11, GPIO_X, 1},
+    {PTB12, GPIO_X, 1},
+    {PTB13, GPIO_X, 1},
+    {PTB16, GPIO_X, 1},
+    {PTB17, GPIO_X, 1},
+    {PTB18, GPIO_X, 1},
+    {PTB19, GPIO_X, 1},
+    {PTB20, GPIO_X, 1},
+    {PTB21, GPIO_X, 1},
+    {PTB22, GPIO_X, 1},
+    {PTB23, GPIO_X, 1},
+
+    {PTC0, GPIO_X, 1},
+    {PTC1, GPIO_X, 1},
+    {PTC2, GPIO_X, 1},
+    {PTC3, GPIO_X, 1},
+    {PTC4, GPIO_X, 1},
+    {PTC5, GPIO_X, 1},
+    {PTC6, GPIO_X, 1},
+    {PTC7, GPIO_X, 1},
+    {PTC8, GPIO_X, 1},
+    {PTC9, GPIO_X, 1},
+    {PTC10, GPIO_X, 1},
+    {PTC11, GPIO_X, 1},
+    {PTC12, GPIO_X, 1},
+    {PTC13, GPIO_X, 1},
+    {PTC14, GPIO_X, 1},
+    {PTC15, GPIO_X, 1},
+    {PTC16, GPIO_X, 1},
+    {PTC17, GPIO_X, 1},
+    {PTC18, GPIO_X, 1},
+    {PTC19, GPIO_X, 1},
+
+    {PTD0, GPIO_X, 1},
+    {PTD1, GPIO_X, 1},
+    {PTD2, GPIO_X, 1},
+    {PTD3, GPIO_X, 1},
+    {PTD4, GPIO_X, 1},
+    {PTD5, GPIO_X, 1},
+    {PTD6, GPIO_X, 1},
+    {PTD7, GPIO_X, 1},
+    {PTD8, GPIO_X, 1},
+    {PTD9, GPIO_X, 1},
+    {PTD10, GPIO_X, 1},
+    {PTD11, GPIO_X, 1},
+    {PTD12, GPIO_X, 1},
+    {PTD13, GPIO_X, 1},
+    {PTD14, GPIO_X, 1},
+    {PTD15, GPIO_X, 1},
+
+    {PTE0, GPIO_X, 1},
+    {PTE1, GPIO_X, 1},
+    {PTE2, GPIO_X, 1},
+    {PTE3, GPIO_X, 1},
+    {PTE4, GPIO_X, 1},
+    {PTE5, GPIO_X, 1},
+    {PTE6, GPIO_X, 1},
+    {PTE7, GPIO_X, 1},
+    {PTE8, GPIO_X, 1},
+    {PTE9, GPIO_X, 1},
+    {PTE10, GPIO_X, 1},
+    {PTE11, GPIO_X, 1},
+    {PTE12, GPIO_X, 1},
+    // {PTE24, GPIO_X, 1}, // fixed pull-up (for I2C)
+    // {PTE25, GPIO_X, 1}, // fixed pull-up (for I2C)
+    {PTE26, GPIO_X, 1},
+    {PTE27, GPIO_X, 1},
+    {PTE28, GPIO_X, 1},
+
+    {NC, NC, 0}
+};
+
+/************RTC***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_RTC[] = {
+    {NC, OSC32KCLK, 0},
+};
+
+/************ADC***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_ADC[] = {
+    {PTA17, ADC1_SE17, 0},
+    {PTB0, ADC0_SE8, 0},
+    {PTB1, ADC0_SE9, 0},
+    {PTB2, ADC0_SE12, 0},
+    {PTB3, ADC0_SE13, 0},
+    {PTB6, ADC1_SE12, 0},
+    {PTB7, ADC1_SE13, 0},
+    {PTB10, ADC1_SE14, 0},
+    {PTB11, ADC1_SE15, 0},
+    {PTC0, ADC0_SE14, 0},
+    {PTC1, ADC0_SE15, 0},
+    {PTC2,  ADC0_SE4b, 0},
+    {PTC8,  ADC1_SE4b, 0},
+    {PTC9,  ADC1_SE5b, 0},
+    {PTC10, ADC1_SE6b, 0},
+    {PTC11, ADC1_SE7b, 0},
+    {PTD1,  ADC0_SE5b, 0},
+    {PTD5,  ADC0_SE6b, 0},
+    {PTD6,  ADC0_SE7b, 0},
+    {PTE0,  ADC1_SE4a, 0},
+    {PTE1,  ADC1_SE5a, 0},
+    {PTE2,  ADC1_SE6a, 0},
+    {PTE3,  ADC1_SE7a, 0},
+    //{PTE24, ADC0_SE17, 0}, //I2C pull up
+    //{PTE25, ADC0_SE18, 0}, //I2C pull up
+    {NC, NC, 0}
+};
+
+/************DAC***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_DAC[] = {
+    {DAC0_OUT, DAC_0, 0},
+    {NC, NC, 0}
+};
+
+/************I2C***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_I2C_SDA[] = {
+    {PTE25, I2C_0, 5},
+    {PTB1, I2C_0, 2},
+    {PTB3, I2C_0, 2},
+    {PTC11, I2C_1, 2},
+    {PTA13, I2C_2, 5},
+    {PTD3, I2C_0, 7},
+    {PTE0, I2C_1, 6},
+    {NC, NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_I2C_SCL[] = {
+    {PTE24, I2C_0, 5},
+    {PTB0, I2C_0, 2},
+    {PTB2, I2C_0, 2},
+    {PTC10, I2C_1, 2},
+    {PTA12, I2C_2, 5},
+    {PTA14, I2C_2, 5},
+    {PTD2, I2C_0, 7},
+    {PTE1, I2C_1, 6},
+    {NC, NC, 0}
+};
+
+/************UART***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_UART_TX[] = {
+    {PTB17, UART_0, 3},
+    {PTC17, UART_3, 3},
+    {PTD7, UART_0, 3},
+    {PTD3, UART_2, 3},
+    {PTC4, UART_1, 3},
+    {PTC15, UART_4, 3},
+    {PTB11, UART_3, 3},
+    {PTA14, UART_0, 3},
+    {PTE24, UART_4, 3},
+    {PTE4, UART_3, 3},
+    {PTE0,  UART_1, 3},
+    {NC,  NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_UART_RX[] = {
+    {PTB16, UART_0, 3},
+    {PTE1, UART_1, 3},
+    {PTE5, UART_3, 3},
+    {PTE25, UART_4, 3},
+    {PTA15, UART_0, 3},
+    {PTC16, UART_3, 3},
+    {PTB10, UART_3, 3},
+    {PTC3, UART_1, 3},
+    {PTC14, UART_4, 3},
+    {PTD2, UART_2, 3},
+    {PTD6, UART_0, 3},
+    {NC,  NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_UART_CTS[] = {
+    {PTB13, UART_3, 2},
+    {PTE2, UART_1, 3},
+    {PTE6, UART_3, 3},
+    {PTE26, UART_4, 3},
+    {PTA0, UART_0, 2},
+    {PTA16, UART_0, 3},
+    {PTB3, UART_0, 3},
+    {PTB9, UART_3, 3},
+    {PTC2, UART_1, 3},
+    {PTC13, UART_4, 3},
+    {PTC19, UART_3, 3},
+    {PTD1, UART_2, 3},
+    {PTD5, UART_0, 3},
+    {NC, NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_UART_RTS[] = {
+    {PTB12, UART_3, 2},
+    {PTE3, UART_1, 3},
+    {PTE7, UART_3, 3},
+    {PTE27, UART_4, 3},
+    {PTA17, UART_0, 3},
+    {PTB8, UART_3, 3},
+    {PTC1, UART_1, 3},
+    {PTC12, UART_4, 3},
+    {PTC18, UART_3, 3},
+    {PTD0, UART_2, 3},
+    {PTD4, UART_0, 3},
+    {PTA3, UART_0, 2},
+    {PTB2, UART_0, 3},
+    {NC, NC, 0}
+};
+
+/************SPI***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_SPI_SCLK[] = {
+    {PTD1, SPI_0, 2},
+    {PTE2, SPI_1, 2},
+    {PTA15, SPI_0, 2},
+    {PTB11, SPI_1, 2},
+    {PTB21, SPI_2, 2},
+    {PTC5, SPI_0, 2},
+    {PTD5, SPI_1, 7},
+    {NC, NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_SPI_MOSI[] = {
+    {PTD2, SPI_0, 2},
+    {PTE1, SPI_1, 2},
+    {PTE3, SPI_1, 7},
+    {PTA16, SPI_0, 2},
+    {PTB16, SPI_1, 2},
+    {PTB22, SPI_2, 2},
+    {PTC6, SPI_0, 2},
+    {PTD6, SPI_1, 7},
+    {NC, NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_SPI_MISO[] = {
+    {PTD3, SPI_0, 2},
+    {PTE1, SPI_1, 7},
+    {PTE3, SPI_1, 2},
+    {PTA17, SPI_0, 2},
+    {PTB17, SPI_1, 2},
+    {PTB23, SPI_2, 2},
+    {PTC7, SPI_0, 2},
+    {PTD7, SPI_1, 7},
+    {NC, NC, 0}
+};
+
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_SPI_SSEL[] = {
+    {PTD0, SPI_0, 2},
+    {PTE4, SPI_1, 2},
+    {PTA14, SPI_0, 2},
+    {PTB10, SPI_1, 2},
+    {PTB20, SPI_2, 2},
+    {PTC4, SPI_0, 2},
+    {PTD4, SPI_1, 7},
+    {NC, NC, 0}
+};
+
+/************PWM***************/
+MSTD_CONSTEXPR_OBJ_11 PinMap PinMap_PWM[] = {
+    {PTA0, PWM_6, 3},
+    {PTA1, PWM_7, 3},
+    {PTA2, PWM_8, 3},
+    {PTA3, PWM_1, 3},
+    {PTA4, PWM_2, 3},
+    {PTA5, PWM_3, 3},
+    {PTA6, PWM_4, 3},
+    {PTA7, PWM_5, 3},
+    {PTA8, PWM_9, 3},
+    {PTA9, PWM_10, 3},
+    {PTA10, PWM_17, 3},
+    {PTA11, PWM_18, 3},
+    {PTA12, PWM_9, 3},
+    {PTA13, PWM_10, 3},
+
+    {PTB0, PWM_9, 3},
+    {PTB1, PWM_10, 3},
+    {PTB18, PWM_17, 3},
+    {PTB19, PWM_18, 3},
+
+    {PTC1, PWM_1, 4},
+    {PTC2, PWM_2, 4},
+    {PTC3, PWM_3, 4},
+    {PTC4, PWM_4, 4},
+    {PTC5, PWM_3, 7},
+    {PTC8, PWM_29, 3},
+    {PTC9, PWM_30, 3},
+    {PTC10, PWM_31, 3},
+    {PTC11, PWM_32, 3},
+
+    {PTD0, PWM_25, 4},
+    {PTD1, PWM_26, 4},
+    {PTD2, PWM_27, 4},
+    {PTD3, PWM_28, 4},
+    {PTD4, PWM_5, 4},
+    {PTD5, PWM_6, 4},
+    {PTD6, PWM_7, 4},
+    {PTD4, PWM_5, 4},
+    {PTD7, PWM_8, 4},
+
+    {PTE5, PWM_25, 6},
+    {PTE6, PWM_26, 6},
+
+    {NC, NC, 0}
+};
+
+#define PINMAP_ANALOGIN PinMap_ADC
+#define PINMAP_ANALOGOUT PinMap_DAC
+#define PINMAP_I2C_SDA PinMap_I2C_SDA
+#define PINMAP_I2C_SCL PinMap_I2C_SCL
+#define PINMAP_UART_TX PinMap_UART_TX
+#define PINMAP_UART_RX PinMap_UART_RX
+#define PINMAP_UART_CTS PinMap_UART_CTS
+#define PINMAP_UART_RTS PinMap_UART_RTS
+#define PINMAP_SPI_SCLK PinMap_SPI_SCLK
+#define PINMAP_SPI_MOSI PinMap_SPI_MOSI
+#define PINMAP_SPI_MISO PinMap_SPI_MISO
+#define PINMAP_SPI_SSEL PinMap_SPI_SSEL
+#define PINMAP_PWM PinMap_PWM
+
+
+#endif
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPins.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPins.c
index cba1a605f3..a41c0708f4 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPins.c
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PeripheralPins.c
@@ -15,233 +15,9 @@
  */
 
 #include "PeripheralPins.h"
+#include "PeripheralPinMaps.h"
 
-/************RTC***************/
-const PinMap PinMap_RTC[] = {
-    {NC, OSC32KCLK, 0},
-};
-
-/************ADC***************/
-const PinMap PinMap_ADC[] = {
-    {PTA17, ADC1_SE17, 0},
-    {PTB0 , ADC0_SE8 , 0},
-    {PTB1 , ADC0_SE9 , 0},
-    {PTB2 , ADC0_SE12, 0},
-    {PTB3 , ADC0_SE13, 0},
-    {PTB6 , ADC1_SE12, 0},
-    {PTB7 , ADC1_SE13, 0},
-    {PTB10, ADC1_SE14, 0},
-    {PTB11, ADC1_SE15, 0},
-    {PTC0 , ADC0_SE14, 0},
-    {PTC1 , ADC0_SE15, 0},
-    {PTC2,  ADC0_SE4b, 0},
-    {PTC8,  ADC1_SE4b, 0},
-    {PTC9,  ADC1_SE5b, 0},
-    {PTC10, ADC1_SE6b, 0},
-    {PTC11, ADC1_SE7b, 0},
-    {PTD1,  ADC0_SE5b, 0},
-    {PTD5,  ADC0_SE6b, 0},
-    {PTD6,  ADC0_SE7b, 0},
-    {PTE0,  ADC1_SE4a, 0},
-    {PTE1,  ADC1_SE5a, 0},
-    {PTE2,  ADC1_SE6a, 0},
-    {PTE3,  ADC1_SE7a, 0},
-    //{PTE24, ADC0_SE17, 0}, //I2C pull up
-    //{PTE25, ADC0_SE18, 0}, //I2C pull up
-    {NC   , NC       , 0}
-};
-
-/************DAC***************/
-const PinMap PinMap_DAC[] = {
-    {DAC0_OUT, DAC_0, 0},
-    {NC      , NC   , 0}
-};
-
-/************I2C***************/
-const PinMap PinMap_I2C_SDA[] = {
-    {PTE25, I2C_0, 5},
-    {PTB1 , I2C_0, 2},
-    {PTB3 , I2C_0, 2},
-    {PTC11, I2C_1, 2},
-    {PTA13, I2C_2, 5},
-    {PTD3 , I2C_0, 7},
-    {PTE0 , I2C_1, 6},
-    {NC   , NC   , 0}
-};
-
-const PinMap PinMap_I2C_SCL[] = {
-    {PTE24, I2C_0, 5},
-    {PTB0 , I2C_0, 2},
-    {PTB2 , I2C_0, 2},
-    {PTC10, I2C_1, 2},
-    {PTA12, I2C_2, 5},
-    {PTA14, I2C_2, 5},
-    {PTD2 , I2C_0, 7},
-    {PTE1 , I2C_1, 6},
-    {NC   , NC   , 0}
-};
-
-/************UART***************/
-const PinMap PinMap_UART_TX[] = {
-    {PTB17, UART_0, 3},
-    {PTC17, UART_3, 3},
-    {PTD7 , UART_0, 3},
-    {PTD3 , UART_2, 3},
-    {PTC4 , UART_1, 3},
-    {PTC15, UART_4, 3},
-    {PTB11, UART_3, 3},
-    {PTA14, UART_0, 3},
-    {PTE24, UART_4, 3},
-    {PTE4 , UART_3, 3},
-    {PTE0,  UART_1, 3},
-    {PTE0,  UART_1, 3},
-    {PTD9,  UART_5, 3},
-    {NC  ,  NC    , 0}
-};
-
-const PinMap PinMap_UART_RX[] = {
-    {PTB16, UART_0, 3},
-    {PTE1 , UART_1, 3},
-    {PTE5 , UART_3, 3},
-    {PTE25, UART_4, 3},
-    {PTA15, UART_0, 3},
-    {PTC16, UART_3, 3},
-    {PTB10, UART_3, 3},
-    {PTC3 , UART_1, 3},
-    {PTC14, UART_4, 3},
-    {PTD2 , UART_2, 3},
-    {PTD6 , UART_0, 3},
-    {PTD8,  UART_5, 3},
-    {NC  ,  NC    , 0}
-};
-
-const PinMap PinMap_UART_CTS[] = {
-    {PTB13, UART_3, 2},
-    {PTE2 , UART_1, 3},
-    {PTE6 , UART_3, 3},
-    {PTE26, UART_4, 3},
-    {PTA0 , UART_0, 2},
-    {PTA16, UART_0, 3},
-    {PTB3 , UART_0, 3},
-    {PTB9 , UART_3, 3},
-    {PTC2 , UART_1, 3},
-    {PTC13, UART_4, 3},
-    {PTC19, UART_3, 3},
-    {PTD1 , UART_2, 3},
-    {PTD5 , UART_0, 3},
-    {PTD11, UART_5, 3},
-    {NC   , NC    , 0}
-};
-
-const PinMap PinMap_UART_RTS[] = {
-    {PTB12, UART_3, 2},
-    {PTE3 , UART_1, 3},
-    {PTE7 , UART_3, 3},
-    {PTE27, UART_4, 3},
-    {PTA17, UART_0, 3},
-    {PTB8 , UART_3, 3},
-    {PTC1 , UART_1, 3},
-    {PTC12, UART_4, 3},
-    {PTC18, UART_3, 3},
-    {PTD0 , UART_2, 3},
-    {PTD4 , UART_0, 3},
-    {PTA3 , UART_0, 2},
-    {PTB2 , UART_0, 3},
-    {PTD10, UART_5, 3},
-    {NC   , NC    , 0}
-};
-
-/************SPI***************/
-const PinMap PinMap_SPI_SCLK[] = {
-    {PTD1 , SPI_0, 2},
-    {PTE2 , SPI_1, 2},
-    {PTA15, SPI_0, 2},
-    {PTB11, SPI_1, 2},
-    {PTB21, SPI_2, 2},
-    {PTC5 , SPI_0, 2},
-    {PTD5 , SPI_1, 7},
-    {NC   , NC   , 0}
-};
-
-const PinMap PinMap_SPI_MOSI[] = {
-    {PTD2 , SPI_0, 2},
-    {PTE1 , SPI_1, 2},
-    {PTE3 , SPI_1, 7},
-    {PTA16, SPI_0, 2},
-    {PTB16, SPI_1, 2},
-    {PTB22, SPI_2, 2},
-    {PTC6 , SPI_0, 2},
-    {PTD6 , SPI_1, 7},
-    {NC   , NC   , 0}
-};
-
-const PinMap PinMap_SPI_MISO[] = {
-    {PTD3 , SPI_0, 2},
-    {PTE1 , SPI_1, 7},
-    {PTE3 , SPI_1, 2},
-    {PTA17, SPI_0, 2},
-    {PTB17, SPI_1, 2},
-    {PTB23, SPI_2, 2},
-    {PTC7 , SPI_0, 2},
-    {PTD7 , SPI_1, 7},
-    {NC   , NC   , 0}
-};
-
-const PinMap PinMap_SPI_SSEL[] = {
-    {PTD0 , SPI_0, 2},
-    {PTE4 , SPI_1, 2},
-    {PTA14, SPI_0, 2},
-    {PTB10, SPI_1, 2},
-    {PTB20, SPI_2, 2},
-    {PTC4 , SPI_0, 2},
-    {PTD4 , SPI_1, 7},
-    {NC   , NC   , 0}
-};
-
-/************PWM***************/
-const PinMap PinMap_PWM[] = {
-    {PTA0 , PWM_6 , 3},
-    {PTA1 , PWM_7 , 3},
-    {PTA2 , PWM_8 , 3},
-    {PTA3 , PWM_1 , 3},
-    {PTA4 , PWM_2 , 3},
-    {PTA5 , PWM_3 , 3},
-    {PTA6 , PWM_4 , 3},
-    {PTA7 , PWM_5 , 3},
-    {PTA8 , PWM_9 , 3},
-    {PTA9 , PWM_10, 3},
-    {PTA10, PWM_17, 3},
-    {PTA11, PWM_18, 3},
-    {PTA12, PWM_9 , 3},
-    {PTA13, PWM_10, 3},
-
-    {PTB0 , PWM_9 , 3},
-    {PTB1 , PWM_10, 3},
-    {PTB18, PWM_17, 3},
-    {PTB19, PWM_18, 3},
-
-    {PTC1 , PWM_1 , 4},
-    {PTC2 , PWM_2 , 4},
-    {PTC3 , PWM_3 , 4},
-    {PTC4 , PWM_4 , 4},
-    {PTC5 , PWM_3 , 7},
-    {PTC8 , PWM_29, 3},
-    {PTC9 , PWM_30, 3},
-    {PTC10, PWM_31, 3},
-    {PTC11, PWM_32, 3},
-
-    {PTD0 , PWM_25, 4},
-    {PTD1 , PWM_26, 4},
-    {PTD2 , PWM_27, 4},
-    {PTD3 , PWM_28, 4},
-    {PTD4 , PWM_5 , 4},
-    {PTD5 , PWM_6 , 4},
-    {PTD6 , PWM_7 , 4},
-    {PTD4 , PWM_5 , 4},
-    {PTD7 , PWM_8 , 4},
-
-    {PTE5 , PWM_25, 6},
-    {PTE6 , PWM_26, 6},
-
-    {NC   , NC    , 0}
-};
+const PinMap *gpio_pinmap()
+{
+    return PinMap_GPIO;
+}
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PinNames.h b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PinNames.h
index e68cd20bb8..652f21dde7 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PinNames.h
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/PinNames.h
@@ -22,13 +22,14 @@
 extern "C" {
 #endif
 
+/* If this macro is defined, then constexpr utility functions for pin-map seach can be used. */
+#define STATIC_PINMAP_READY 1
+
 typedef enum {
     PIN_INPUT,
     PIN_OUTPUT
 } PinDirection;
 
-#define DAC0_OUT 0xFEFE /* DAC does not have Pin Name in RM */
-#define NOT_CONNECTED (int)0xFFFFFFFF
 #define GPIO_PORT_SHIFT 12
 
 typedef enum {
@@ -193,7 +194,10 @@ typedef enum {
     PTE30 = (4 << GPIO_PORT_SHIFT | 30),
     PTE31 = (4 << GPIO_PORT_SHIFT | 31),
 
-       // Analog
+    DAC0_OUT = 0xFEFE, /* DAC does not have Pin Name in RM */
+    NOT_CONNECTED = (int)0xFFFFFFFF,
+
+    // Analog
     A0 = PTB6,
     A1 = PTB7,
     A2 = DAC0_OUT,
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/mbed_overrides.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/mbed_overrides.c
index f4318d9fb5..a80b1e7a22 100644
--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/mbed_overrides.c
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_SDT64B/mbed_overrides.c
@@ -99,3 +99,5 @@ void mbed_mac_address(char *mac)
 
 }
 
+
+