diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index fcc435b7b9..c79fe8114c 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -338,10 +338,6 @@ if (MICROPY_PY_NETWORK_CYW43)
     )
     endif()
 
-    list(APPEND MICROPY_SOURCE_PORT
-        machine_pin_cyw43.c
-    )
-
     target_link_libraries(${MICROPY_TARGET}
         cyw43_driver_picow
         cmsis_core
@@ -412,6 +408,7 @@ endif()
 list(APPEND MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_EXTMOD}
     ${MICROPY_SOURCE_USERMOD}
+    ${MICROPY_SOURCE_BOARD}
 )
 
 # Define mpy-cross flags
@@ -430,6 +427,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_DRIVERS}
     ${MICROPY_SOURCE_PORT}
+    ${MICROPY_SOURCE_BOARD}
 )
 
 target_link_libraries(${MICROPY_TARGET} micropy_lib_mbedtls)
diff --git a/ports/rp2/machine_pin_cyw43.c b/ports/rp2/boards/RPI_PICO_W/machine_pin_cyw43.c
similarity index 100%
rename from ports/rp2/machine_pin_cyw43.c
rename to ports/rp2/boards/RPI_PICO_W/machine_pin_cyw43.c
diff --git a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
index cea6c38d73..343cc9d9d5 100644
--- a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake
@@ -12,3 +12,7 @@ set(MICROPY_PY_BLUETOOTH_CYW43 ON)
 
 # Board specific version of the frozen manifest
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+set(MICROPY_SOURCE_BOARD
+    ${MICROPY_BOARD_DIR}/machine_pin_cyw43.c
+)