diff --git a/hw/bsp/BoardPresets.json b/hw/bsp/BoardPresets.json
index 5df924138..5fbc378d2 100644
--- a/hw/bsp/BoardPresets.json
+++ b/hw/bsp/BoardPresets.json
@@ -234,6 +234,10 @@
       "name": "frdm_mcxn947",
       "inherits": "default"
     },
+    {
+      "name": "frdm_rw612",
+      "inherits": "default"
+    },
     {
       "name": "itsybitsy_m0",
       "inherits": "default"
@@ -362,10 +366,6 @@
       "name": "metro_m7_1011_sd",
       "inherits": "default"
     },
-    {
-      "name": "metro_nrf52840",
-      "inherits": "default"
-    },
     {
       "name": "mimxrt1010_evk",
       "inherits": "default"
@@ -518,10 +518,6 @@
       "name": "raspberry_pi_pico2",
       "inherits": "default"
     },
-    {
-      "name": "raspberry_pi_pico2_riscv",
-      "inherits": "default"
-    },
     {
       "name": "raspberry_pi_pico_w",
       "inherits": "default"
@@ -1228,6 +1224,11 @@
       "description": "Build preset for the frdm_mcxn947 board",
       "configurePreset": "frdm_mcxn947"
     },
+    {
+      "name": "frdm_rw612",
+      "description": "Build preset for the frdm_rw612 board",
+      "configurePreset": "frdm_rw612"
+    },
     {
       "name": "itsybitsy_m0",
       "description": "Build preset for the itsybitsy_m0 board",
@@ -1388,11 +1389,6 @@
       "description": "Build preset for the metro_m7_1011_sd board",
       "configurePreset": "metro_m7_1011_sd"
     },
-    {
-      "name": "metro_nrf52840",
-      "description": "Build preset for the metro_nrf52840 board",
-      "configurePreset": "metro_nrf52840"
-    },
     {
       "name": "mimxrt1010_evk",
       "description": "Build preset for the mimxrt1010_evk board",
@@ -1583,11 +1579,6 @@
       "description": "Build preset for the raspberry_pi_pico2 board",
       "configurePreset": "raspberry_pi_pico2"
     },
-    {
-      "name": "raspberry_pi_pico2_riscv",
-      "description": "Build preset for the raspberry_pi_pico2_riscv board",
-      "configurePreset": "raspberry_pi_pico2_riscv"
-    },
     {
       "name": "raspberry_pi_pico_w",
       "description": "Build preset for the raspberry_pi_pico_w board",
@@ -2854,6 +2845,19 @@
         }
       ]
     },
+    {
+      "name": "frdm_rw612",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "frdm_rw612"
+        },
+        {
+          "type": "build",
+          "name": "frdm_rw612"
+        }
+      ]
+    },
     {
       "name": "itsybitsy_m0",
       "steps": [
@@ -3270,19 +3274,6 @@
         }
       ]
     },
-    {
-      "name": "metro_nrf52840",
-      "steps": [
-        {
-          "type": "configure",
-          "name": "metro_nrf52840"
-        },
-        {
-          "type": "build",
-          "name": "metro_nrf52840"
-        }
-      ]
-    },
     {
       "name": "mimxrt1010_evk",
       "steps": [
@@ -3777,19 +3768,6 @@
         }
       ]
     },
-    {
-      "name": "raspberry_pi_pico2_riscv",
-      "steps": [
-        {
-          "type": "configure",
-          "name": "raspberry_pi_pico2_riscv"
-        },
-        {
-          "type": "build",
-          "name": "raspberry_pi_pico2_riscv"
-        }
-      ]
-    },
     {
       "name": "raspberry_pi_pico_w",
       "steps": [