diff --git a/platformio/boards/atmelsam.json b/platformio/boards/atmelsam.json
new file mode 100644
index 00000000..bb2561ee
--- /dev/null
+++ b/platformio/boards/atmelsam.json
@@ -0,0 +1,50 @@
+{
+    "samr21_xpro": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m0plus",
+            "mcu": "atsamr21g18a"
+        },
+        "frameworks": ["mbed"],
+        "name": "Atmel ATSAMR21-XPRO",
+        "platform": "atmelsam",
+        "upload": {
+            "maximum_ram_size": 32768,
+            "maximum_size": 262144
+        },
+        "url": "https://developer.mbed.org/platforms/SAMR21-XPRO/",
+        "vendor": "Atmel"
+    },
+    "saml21_xpro_b": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m0plus",
+            "mcu": "atsaml21j18b"
+        },
+        "frameworks": ["mbed"],
+        "name": "Atmel SAML21-XPRO-B",
+        "platform": "atmelsam",
+        "upload": {
+            "maximum_ram_size": 32768,
+            "maximum_size": 262144
+        },
+        "url": "https://developer.mbed.org/platforms/SAML21-XPRO/",
+        "vendor": "Atmel"
+    },
+    "samd21_xpro": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m0plus",
+            "mcu": "atsamd21j18a"
+        },
+        "frameworks": ["mbed"],
+        "name": "Atmel SAMD21-XPRO",
+        "platform": "atmelsam",
+        "upload": {
+            "maximum_ram_size": 32768,
+            "maximum_size": 262144
+        },
+        "url": "https://developer.mbed.org/platforms/SAMD21-XPRO/",
+        "vendor": "Atmel"
+    }
+}
diff --git a/platformio/boards/ststm32.json b/platformio/boards/ststm32.json
index 4eef729d..cd5483a3 100644
--- a/platformio/boards/ststm32.json
+++ b/platformio/boards/ststm32.json
@@ -441,5 +441,101 @@
         },
         "url": "http://www.st.com/web/en/catalog/tools/PF260318",
         "vendor": "ST"
+    },
+    "disco_f469ni": {
+        "build": {
+            "f_cpu": "180000000L",
+            "cpu": "cortex-m4",
+            "mcu": "stm32f469nih6"
+        },
+        "frameworks": ["mbed"],
+        "name": "ST 32F469IDISCOVERY",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 393216,
+            "maximum_size": 1048576
+        },
+        "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF262395",
+        "vendor": "ST"
+    },
+    "disco_l476vg": {
+        "build": {
+            "f_cpu": "80000000L",
+            "cpu": "cortex-m4",
+            "mcu": "stm32l476vgt6"
+        },
+        "frameworks": ["mbed"],
+        "name": "ST 32L476GDISCOVERY",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 131072,
+            "maximum_size": 1048576
+        },
+        "url": "http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF261635",
+        "vendor": "ST"
+    },
+    "nucleo_f031k6": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m0",
+            "mcu": "stm32f031k6t6"
+        },
+        "frameworks": ["mbed"],
+        "name": "ST Nucleo F031K6",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 4096,
+            "maximum_size": 32768
+        },
+        "url": "https://developer.mbed.org/platforms/ST-Nucleo-F031K6/",
+        "vendor": "ST"
+    },
+    "nucleo_f042k6": {
+        "build": {
+            "f_cpu": "48000000L",
+            "cpu": "cortex-m0",
+            "mcu": "stm32f042k6t6"
+        },
+        "frameworks": ["mbed"],
+        "name": "ST Nucleo F042K6",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 6144,
+            "maximum_size": 32768
+        },
+        "url": "https://developer.mbed.org/platforms/ST-Nucleo-F042K6/",
+        "vendor": "ST"
+    },
+    "nucleo_f303k8": {
+        "build": {
+            "f_cpu": "72000000L",
+            "cpu": "cortex-m4",
+            "mcu": "stm32f303k8t6"
+        },
+        "frameworks": ["mbed"],
+        "name": "ST Nucleo F303K8",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 16384,
+            "maximum_size": 65536
+        },
+        "url": "https://developer.mbed.org/platforms/ST-Nucleo-F303K8/",
+        "vendor": "ST"
+    },
+    "nucleo_l476rg": {
+        "build": {
+            "f_cpu": "80000000L",
+            "cpu": "cortex-m4",
+            "mcu": "stm32l476rgt6"
+        },
+        "frameworks": ["mbed"],
+        "name": "ST Nucleo L476RG",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 131072,
+            "maximum_size": 1048576
+        },
+        "url": "https://developer.mbed.org/platforms/ST-Nucleo-L476RG/",
+        "vendor": "ST"
     }
 }
diff --git a/platformio/builder/scripts/frameworks/mbed.py b/platformio/builder/scripts/frameworks/mbed.py
index fbd86801..a5f9b76e 100644
--- a/platformio/builder/scripts/frameworks/mbed.py
+++ b/platformio/builder/scripts/frameworks/mbed.py
@@ -54,7 +54,7 @@ MBED_VARIANTS = {
     "seeedTinyBLE": "SEEED_TINY_BLE",
     "redBearLab": "RBLAB_NRF51822",
     "nrf51-dt": "NRF51_DK",
-    "redBearLabBLENano": "RBLAB_NRF51822",
+    "redBearLabBLENano": "RBLAB_BLENANO",
     "wallBotBLE": "NRF51822",
     "frdm_kl25z": "KL25Z",
     "frdm_kl46z": "KL46Z",
@@ -63,7 +63,10 @@ MBED_VARIANTS = {
     "frdm_k20d50m": "K20D50M",
     "frdm_k22f": "K22F",
     "teensy31": "TEENSY3_1",
-    "dfcm_nnn40": "DELTA_DFCM_NNN40"
+    "dfcm_nnn40": "DELTA_DFCM_NNN40",
+    "samr21_xpro": "SAMR21G18A",
+    "saml21_xpro_b": "SAML21J18A",
+    "samd21_xpro": "SAMD21J18A"
 }
 
 MBED_LIBS_MAP = {