From 3e7f5ea541763d171ce0ded9508db72d1e4020cf Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Fri, 8 Sep 2023 15:07:47 +0100 Subject: [PATCH] ports/rp2: Move Pico W ext pins to board config. Signed-off-by: Phil Howard --- ports/rp2/CMakeLists.txt | 6 ++---- ports/rp2/{ => boards/RPI_PICO_W}/machine_pin_cyw43.c | 0 ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) rename ports/rp2/{ => boards/RPI_PICO_W}/machine_pin_cyw43.c (100%) diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt index 7718697b43..a0e2025f2d 100644 --- a/ports/rp2/CMakeLists.txt +++ b/ports/rp2/CMakeLists.txt @@ -297,10 +297,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 @@ -371,6 +367,7 @@ endif() list(APPEND MICROPY_SOURCE_QSTR ${MICROPY_SOURCE_EXTMOD} ${MICROPY_SOURCE_USERMOD} + ${MICROPY_SOURCE_BOARD} ) # Define mpy-cross flags @@ -389,6 +386,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 5610c313e6..bb6dcd0fa7 100644 --- a/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake +++ b/ports/rp2/boards/RPI_PICO_W/mpconfigboard.cmake @@ -15,3 +15,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 +)