diff --git a/boards/edge_control.json b/boards/edge_control.json
new file mode 100644
index 00000000..41f587d9
--- /dev/null
+++ b/boards/edge_control.json
@@ -0,0 +1,53 @@
+{
+    "build": {
+      "arduino": {
+        "ldscript": "linker_script.ld"
+      },
+      "core": "arduino",
+      "cpu": "cortex-m4",
+      "extra_flags": "-DARDUINO_EDGE_CONTROL -DARDUINO_ARCH_NRF52840",
+      "f_cpu": "64000000L",
+      "hwids": [
+        [
+          "0x2341",
+          "0x005d"
+        ],
+        [
+          "0x2341",
+          "0x805d"
+        ]
+      ],
+      "mcu": "nrf52840",
+      "variant": "EDGE_CONTROL"
+    },
+    "connectivity": [
+      "bluetooth"
+    ],
+    "debug": {
+      "jlink_device": "nRF52840_xxAA",
+      "openocd_target": "nrf52.cfg",
+      "svd_path": "nrf52840.svd"
+    },
+    "frameworks": [
+      "arduino"
+    ],
+    "name": "Arduino Edge Control",
+    "upload": {
+      "maximum_ram_size": 262144,
+      "maximum_size": 983040,
+      "protocol": "sam-ba",
+      "protocols": [
+        "jlink",
+        "nrfjprog",
+        "nrfutil",
+        "cmsis-dap",
+        "sam-ba",
+        "blackmagic"
+      ],
+      "use_1200bps_touch": true,
+      "require_upload_port": true,
+      "wait_for_upload_port": true
+    },
+    "url": "https://docs.arduino.cc/hardware/edge-control",
+    "vendor": "Arduino"
+  }
diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
index aeceba41..1bd6374f 100644
--- a/examples/arduino-blink/platformio.ini
+++ b/examples/arduino-blink/platformio.ini
@@ -32,6 +32,11 @@ platform = nordicnrf52
 framework = arduino
 board = redbear_blenano2
 
+[env:edge_control]
+platform = nordicnrf52
+framework = arduino
+board = edge_control
+
 [env:redbear_blend2]
 platform = nordicnrf52
 framework = arduino
diff --git a/examples/arduino-blink/src/Blink.cpp b/examples/arduino-blink/src/Blink.cpp
index d2c77fe8..b347c9df 100644
--- a/examples/arduino-blink/src/Blink.cpp
+++ b/examples/arduino-blink/src/Blink.cpp
@@ -6,6 +6,10 @@
 
 #include <Arduino.h>
 
+#ifndef LED_BUILTIN
+#define LED_BUILTIN 13
+#endif
+
 void setup()
 {
   // initialize LED digital pin as an output.
diff --git a/examples/arduino-bluefruit-bleuart/platformio.ini b/examples/arduino-bluefruit-bleuart/platformio.ini
index 955918b7..187cecae 100644
--- a/examples/arduino-bluefruit-bleuart/platformio.ini
+++ b/examples/arduino-bluefruit-bleuart/platformio.ini
@@ -13,6 +13,8 @@ platform = nordicnrf52
 framework = arduino
 board = adafruit_feather_nrf52832
 monitor_speed = 115200
+; nRF crypto only supported on nRF52840
+lib_ignore = Adafruit nRFCrypto
 
 [env:adafruit_feather_nrf52840]
 platform = nordicnrf52
@@ -25,6 +27,7 @@ platform = nordicnrf52
 framework = arduino
 board = nrf52840_dk_adafruit
 monitor_speed = 115200
+
 [env:adafruit_metro_nrf52840]
 platform = nordicnrf52
 framework = arduino
diff --git a/platform.py b/platform.py
index 6763fb1c..8a105956 100644
--- a/platform.py
+++ b/platform.py
@@ -59,7 +59,7 @@ def configure_default_packages(self, variables, targets):
                 if not IS_WINDOWS:
                     self.packages["tool-gperf"]["optional"] = False
 
-            if board in ("nano33ble", "nicla_sense_me"):
+            if board in ("nano33ble", "nicla_sense_me", "edge_control"):
                 self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
                 self.frameworks["arduino"]["package"] = "framework-arduino-mbed"
                 self.frameworks["arduino"][