From 3f7696a566afd13a2fbd22a2aa64c2b53a120a5a Mon Sep 17 00:00:00 2001 From: sys64738 Date: Sun, 30 May 2021 04:15:43 +0200 Subject: [PATCH] fix build stuff, add .gitignore, add JTAG support --- .gitignore | 1 + CMakeLists.txt | 4 +- README.md | 36 +++++++++++- bsp/rp2040/DAP_config.h | 100 +++++++++++++++++++++++++++++----- bsp/rp2040/picoprobe_config.h | 13 +++++ pico_sdk_import.cmake | 62 +++++++++++++++++++++ 6 files changed, 199 insertions(+), 17 deletions(-) create mode 100644 .gitignore create mode 100644 pico_sdk_import.cmake diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7113aed --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +cmake-build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f2f526..3a09c77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ get_filename_component(TOP "${TOP}" REALPATH) # Check for -DFAMILY= if(FAMILY STREQUAL "rp2040") cmake_minimum_required(VERSION 3.12) - set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) - include(${PICO_SDK_PATH}/pico_sdk_init.cmake) + #set(PICO_SDK_PATH ${TOP}/hw/mcu/raspberrypi/pico-sdk) + include(pico_sdk_import.cmake) project(${PROJECT}) pico_sdk_init() add_executable(${PROJECT}) diff --git a/README.md b/README.md index 2e1a7c8..3507166 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,48 @@ For BOARD=stm32f072disco, the inexpensive [32F072BDISCOVERY evaluation board](ht ## Building -After initially downloading this project's code, issue the following command to download TinyUSB and CMSIS_5 code (as well as all submodules): +After initially downloading this project's code, issue the following command to download TinyUSB and CMSIS_5 code: ``` -git submodule update --init --recursive +git submodule update --init ``` Follow the TinyUSB build instructions [available here](https://github.com/hathach/tinyusb/tree/master/docs), but issue the make command in the base directory of Dapper Mime. Note that each TinyUSB board name being targeted needs a corresponding subdirectory under the Dapper Mime ./bsp/ subdirectory and a customized version of DAP_config.h for the target. +Alternatively, one can compile with CMake: + +``` +mkdir cmake-build && cd cmake-build +cmake -DBOARD=raspberry_pi_pico -DFAMILIY=rp2040 -DCMAKE_BUILD_TYPE=Debug .. +``` + +## Usage + +The pin mapping is as follows: + +| Pin number | Usage (SWD mode) | Usage (JTAG mode) | +|:---------- |:---------------- |:----------------- | +| GP2 | SWCLK | TCK | +| GP3 | SWDIO | TMS | +| GP4 | UART TX | UART TX | +| GP5 | UART RX | UART RX | +| GP6 | | TDI | +| GP7 | | TDO | +| GP8 | | nTRST | +| GP9 | | nRESET | + +The UART pins are for connecting to the device to be debugged, the data is +echoed back over the USB CDC interface (typically a `/dev/ttyAMAx` device on +Linux). + +In SWD mode, the pin mapping is entirely as with the standard Picoprobe setup, +as described in Chapter 5 and Appendix A of [Getting Started with Raspberry Pi +Pico](https://datasheets.raspberrypi.org/pico/getting-started-with-pico.pdf) + +JTAG mode is currently untested. + ## License TinyUSB is licensed under the [MIT license](https://opensource.org/licenses/MIT). diff --git a/bsp/rp2040/DAP_config.h b/bsp/rp2040/DAP_config.h index 14bc40a..e40ccdb 100644 --- a/bsp/rp2040/DAP_config.h +++ b/bsp/rp2040/DAP_config.h @@ -63,6 +63,15 @@ This information includes: #define PROBE_PIN_SWCLK_MASK (1UL << (PROBE_PIN_SWCLK)) #define PROBE_PIN_SWDIO_MASK (1UL << (PROBE_PIN_SWDIO)) +#define PROBE_PIN_TCK_MASK (1UL << PROBE_PIN_JTAG_TCK) +#define PROBE_PIN_TMS_MASK (1UL << PROBE_PIN_JTAG_TMS) +#define PROBE_PIN_TDI_MASK (1UL << PROBE_PIN_JTAG_TDI) +#define PROBE_PIN_TDO_MASK (1UL << PROBE_PIN_JTAG_TDO) +#define PROBE_PIN_nTRST_MASK (1UL << PROBE_PIN_JTAG_nTRST) +#define PROBE_PIN_nRESET_MASK (1UL << PROBE_PIN_JTAG_nRESET) + +#define PICOPROBE_LED_MASK (1UL << PICOPROBE_LED) + /// Processor Clock of the Cortex-M MCU used in the Debug Unit. /// This value is used to calculate the SWD/JTAG clock speed. #define CPU_CLOCK 48000000U ///< Specifies the CPU Clock in Hz. @@ -81,7 +90,7 @@ This information includes: /// Indicate that JTAG communication mode is available at the Debug Port. /// This information is returned by the command \ref DAP_Info as part of Capabilities. -#define DAP_JTAG 0 ///< JTAG Mode: 1 = available, 0 = not available. +#define DAP_JTAG 1 ///< JTAG Mode: 1 = available, 0 = not available. /// Configure maximum number of JTAG devices on the scan chain connected to the Debug Access Port. /// This setting impacts the RAM requirements of the Debug Unit. Valid range is 1 .. 255. @@ -89,7 +98,7 @@ This information includes: /// Default communication mode on the Debug Access Port. /// Used for the command \ref DAP_Connect when Port Default mode is selected. -#define DAP_DEFAULT_PORT 1U ///< Default JTAG/SWJ Port Mode: 1 = SWD, 2 = JTAG. +#define DAP_DEFAULT_PORT 2U ///< Default JTAG/SWJ Port Mode: 1 = SWD, 2 = JTAG. /// Default communication speed on the Debug Access Port for SWD and JTAG mode. /// Used to initialize the default SWD/JTAG clock frequency. @@ -215,7 +224,45 @@ Configures the DAP Hardware I/O pins for JTAG mode: - TDO to input mode. */ __STATIC_INLINE void PORT_JTAG_SETUP (void) { - ; + + resets_hw->reset &= ~(RESETS_RESET_IO_BANK0_BITS | RESETS_RESET_PADS_BANK0_BITS); + + /* set to default high level */ + sio_hw->gpio_oe_set = PROBE_PIN_TCK_MASK | PROBE_PIN_TMS_MASK | PROBE_PIN_TDI_MASK | PROBE_PIN_nTRST_MASK | PROBE_PIN_nRESET_MASK; + sio_hw->gpio_set = PROBE_PIN_TCK_MASK | PROBE_PIN_TMS_MASK | PROBE_PIN_TDI_MASK | PROBE_PIN_nTRST_MASK | PROBE_PIN_nRESET_MASK; + /* TDO needs to be an input */ + sio_hw->gpio_oe_clr = PROBE_PIN_TDO_MASK; + + hw_write_masked(&padsbank0_hw->io[PROBE_PIN_JTAG_TCK], + PADS_BANK0_GPIO0_IE_BITS, // bits to set: input enable + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); // bits to mask out: input enable, output disable + hw_write_masked(&padsbank0_hw->io[PROBE_PIN_JTAG_TMS], + PADS_BANK0_GPIO0_IE_BITS, + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); + hw_write_masked(&padsbank0_hw->io[PROBE_PIN_JTAG_TDI], + PADS_BANK0_GPIO0_IE_BITS, + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); + hw_write_masked(&padsbank0_hw->io[PROBE_PIN_JTAG_TDO], + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS, // TDO needs to have its output disabled + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); + hw_write_masked(&padsbank0_hw->io[PROBE_PIN_JTAG_nTRST], + PADS_BANK0_GPIO0_IE_BITS, + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); + hw_write_masked(&padsbank0_hw->io[PROBE_PIN_JTAG_nRESET], + PADS_BANK0_GPIO0_IE_BITS, + PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); + + // NOTE: hiZ: ctrl = (ctrl & ~(CTRL_OEOVER_BITS)) | (GPIO_OVERRIDE_LOW << CTRL_OEOVER_LSB); + // normal == 0, low == 2 + + // set pin modes to general IO (SIO) + iobank0_hw->io[PROBE_PIN_JTAG_TCK].ctrl = GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; + iobank0_hw->io[PROBE_PIN_JTAG_TMS].ctrl = GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; + iobank0_hw->io[PROBE_PIN_JTAG_TDI].ctrl = GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; + iobank0_hw->io[PROBE_PIN_JTAG_TDO].ctrl = (GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB) + /*| (GPIO_OVERRIDE_LOW << IO_BANK0_GPIO0_CTRL_OEOVER_LSB)*/; + iobank0_hw->io[PROBE_PIN_JTAG_nTRST].ctrl = GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; + iobank0_hw->io[PROBE_PIN_JTAG_nRESET].ctrl = GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; } /** Setup SWD I/O pins: SWCLK, SWDIO, and nRESET. @@ -252,7 +299,7 @@ __STATIC_INLINE void PORT_OFF (void) { \return Current status of the SWCLK/TCK DAP hardware I/O pin. */ __STATIC_FORCEINLINE uint32_t PIN_SWCLK_TCK_IN (void) { - return (0U); + return (sio_hw->gpio_in & PROBE_PIN_SWCLK_MASK) >> PROBE_PIN_SWCLK; } /** SWCLK/TCK I/O pin: Set Output to High. @@ -276,7 +323,7 @@ __STATIC_FORCEINLINE void PIN_SWCLK_TCK_CLR (void) { \return Current status of the SWDIO/TMS DAP hardware I/O pin. */ __STATIC_FORCEINLINE uint32_t PIN_SWDIO_TMS_IN (void) { - return (0U); + return (sio_hw->gpio_in & PROBE_PIN_SWDIO_MASK) >> PROBE_PIN_SWDIO; } /* PIN_SWDIO_TMS_SET and PIN_SWDIO_TMS_CLR are used by SWJ_Sequence */ @@ -335,14 +382,17 @@ __STATIC_FORCEINLINE void PIN_SWDIO_OUT_DISABLE (void) { \return Current status of the TDI DAP hardware I/O pin. */ __STATIC_FORCEINLINE uint32_t PIN_TDI_IN (void) { - return (0U); + return (sio_hw->gpio_in & PROBE_PIN_TDI_MASK) >> PROBE_PIN_JTAG_TDI; } /** TDI I/O pin: Set Output. \param bit Output value for the TDI DAP hardware I/O pin. */ __STATIC_FORCEINLINE void PIN_TDI_OUT (uint32_t bit) { - (void)bit; + if (bit & 1) + sio_hw->gpio_set = PROBE_PIN_TDI_MASK; + else + sio_hw->gpio_clr = PROBE_PIN_TDI_MASK; } @@ -352,7 +402,7 @@ __STATIC_FORCEINLINE void PIN_TDI_OUT (uint32_t bit) { \return Current status of the TDO DAP hardware I/O pin. */ __STATIC_FORCEINLINE uint32_t PIN_TDO_IN (void) { - return (0U); + return (sio_hw->gpio_in & PROBE_PIN_TDO_MASK) >> PROBE_PIN_JTAG_TDO; } @@ -362,7 +412,7 @@ __STATIC_FORCEINLINE uint32_t PIN_TDO_IN (void) { \return Current status of the nTRST DAP hardware I/O pin. */ __STATIC_FORCEINLINE uint32_t PIN_nTRST_IN (void) { - return (0U); + return (sio_hw->gpio_in & PROBE_PIN_nTRST_MASK) >> PROBE_PIN_JTAG_nTRST; } /** nTRST I/O pin: Set Output. @@ -371,7 +421,10 @@ __STATIC_FORCEINLINE uint32_t PIN_nTRST_IN (void) { - 1: release JTAG TRST Test Reset. */ __STATIC_FORCEINLINE void PIN_nTRST_OUT (uint32_t bit) { - (void)bit; + if (bit & 1) + sio_hw->gpio_set = PROBE_PIN_nTRST_MASK; + else + sio_hw->gpio_clr = PROBE_PIN_nTRST_MASK; } // nRESET Pin I/O------------------------------------------ @@ -380,7 +433,7 @@ __STATIC_FORCEINLINE void PIN_nTRST_OUT (uint32_t bit) { \return Current status of the nRESET DAP hardware I/O pin. */ __STATIC_FORCEINLINE uint32_t PIN_nRESET_IN (void) { - return (0U); + return (sio_hw->gpio_in & PROBE_PIN_nRESET_MASK) >> PROBE_PIN_JTAG_nRESET; } /** nRESET I/O pin: Set Output. @@ -389,7 +442,10 @@ __STATIC_FORCEINLINE uint32_t PIN_nRESET_IN (void) { - 1: release device hardware reset. */ __STATIC_FORCEINLINE void PIN_nRESET_OUT (uint32_t bit) { - (void)bit; + if (bit & 1) + sio_hw->gpio_set = PROBE_PIN_nRESET_MASK; + else + sio_hw->gpio_clr = PROBE_PIN_nRESET_MASK; } ///@} @@ -414,7 +470,14 @@ It is recommended to provide the following LEDs for status indication: - 0: Connect LED OFF: debugger is not connected to CMSIS-DAP Debug Unit. */ __STATIC_INLINE void LED_CONNECTED_OUT (uint32_t bit) { +#if PICOPROBE_LED_CONNECTED + if (bit & 1) + sio_hw->gpio_set = PICOPROBE_LED_MASK; + else + sio_hw->gpio_clr = PICOPROBE_LED_MASK; +#else (void)bit; +#endif } /** Debug Unit: Set status Target Running LED. @@ -423,7 +486,14 @@ __STATIC_INLINE void LED_CONNECTED_OUT (uint32_t bit) { - 0: Target Running LED OFF: program execution in target stopped. */ __STATIC_INLINE void LED_RUNNING_OUT (uint32_t bit) { +#if PICOPROBE_LED_RUNNING + if (bit & 1) + sio_hw->gpio_set = PICOPROBE_LED_MASK; + else + sio_hw->gpio_clr = PICOPROBE_LED_MASK; +#else (void)bit; +#endif } ///@} @@ -473,7 +543,11 @@ Status LEDs. In detail the operation of Hardware I/O and LED pins are enabled an - LED output pins are enabled and LEDs are turned off. */ __STATIC_INLINE void DAP_SETUP (void) { - ; + sio_hw->gpio_oe_set = PICOPROBE_LED_MASK; + sio_hw->gpio_clr = PICOPROBE_LED_MASK; + + hw_write_masked(&padsbank0_hw->io[PICOPROBE_LED], 0, PADS_BANK0_GPIO0_IE_BITS | PADS_BANK0_GPIO0_OD_BITS); + iobank0_hw->io[PICOPROBE_LED].ctrl = GPIO_FUNC_SIO << IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB; } /** Reset Target Device with custom specific I/O pin or command sequence. diff --git a/bsp/rp2040/picoprobe_config.h b/bsp/rp2040/picoprobe_config.h index 23ad28c..15c5274 100644 --- a/bsp/rp2040/picoprobe_config.h +++ b/bsp/rp2040/picoprobe_config.h @@ -58,7 +58,20 @@ #define PICOPROBE_UART_INTERFACE uart1 #define PICOPROBE_UART_BAUDRATE 115200 +// JTAG config +#define PROBE_PIN_JTAG_TCK 2 // == SWCLK +#define PROBE_PIN_JTAG_TMS 3 // == SWDIO +#define PROBE_PIN_JTAG_TDI 6 +#define PROBE_PIN_JTAG_TDO 7 +#define PROBE_PIN_JTAG_nTRST 8 +#define PROBE_PIN_JTAG_nRESET 9 + // LED config + +// you can change these two as you like +#define PICOPROBE_LED_CONNECTED 1 +#define PICOPROBE_LED_RUNNING 0 + #ifndef PICOPROBE_LED #ifndef PICO_DEFAULT_LED_PIN diff --git a/pico_sdk_import.cmake b/pico_sdk_import.cmake new file mode 100644 index 0000000..28efe9e --- /dev/null +++ b/pico_sdk_import.cmake @@ -0,0 +1,62 @@ +# This is a copy of /external/pico_sdk_import.cmake + +# This can be dropped into an external project to help locate this SDK +# It should be include()ed prior to project() + +if (DEFINED ENV{PICO_SDK_PATH} AND (NOT PICO_SDK_PATH)) + set(PICO_SDK_PATH $ENV{PICO_SDK_PATH}) + message("Using PICO_SDK_PATH from environment ('${PICO_SDK_PATH}')") +endif () + +if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT} AND (NOT PICO_SDK_FETCH_FROM_GIT)) + set(PICO_SDK_FETCH_FROM_GIT $ENV{PICO_SDK_FETCH_FROM_GIT}) + message("Using PICO_SDK_FETCH_FROM_GIT from environment ('${PICO_SDK_FETCH_FROM_GIT}')") +endif () + +if (DEFINED ENV{PICO_SDK_FETCH_FROM_GIT_PATH} AND (NOT PICO_SDK_FETCH_FROM_GIT_PATH)) + set(PICO_SDK_FETCH_FROM_GIT_PATH $ENV{PICO_SDK_FETCH_FROM_GIT_PATH}) + message("Using PICO_SDK_FETCH_FROM_GIT_PATH from environment ('${PICO_SDK_FETCH_FROM_GIT_PATH}')") +endif () + +set(PICO_SDK_PATH "${PICO_SDK_PATH}" CACHE PATH "Path to the Raspberry Pi Pico SDK") +set(PICO_SDK_FETCH_FROM_GIT "${PICO_SDK_FETCH_FROM_GIT}" CACHE BOOL "Set to ON to fetch copy of SDK from git if not otherwise locatable") +set(PICO_SDK_FETCH_FROM_GIT_PATH "${PICO_SDK_FETCH_FROM_GIT_PATH}" CACHE FILEPATH "location to download SDK") + +if (NOT PICO_SDK_PATH) + if (PICO_SDK_FETCH_FROM_GIT) + include(FetchContent) + set(FETCHCONTENT_BASE_DIR_SAVE ${FETCHCONTENT_BASE_DIR}) + if (PICO_SDK_FETCH_FROM_GIT_PATH) + get_filename_component(FETCHCONTENT_BASE_DIR "${PICO_SDK_FETCH_FROM_GIT_PATH}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}") + endif () + FetchContent_Declare( + pico_sdk + GIT_REPOSITORY https://github.com/raspberrypi/pico-sdk + GIT_TAG master + ) + if (NOT pico_sdk) + message("Downloading Raspberry Pi Pico SDK") + FetchContent_Populate(pico_sdk) + set(PICO_SDK_PATH ${pico_sdk_SOURCE_DIR}) + endif () + set(FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR_SAVE}) + else () + message(FATAL_ERROR + "SDK location was not specified. Please set PICO_SDK_PATH or set PICO_SDK_FETCH_FROM_GIT to on to fetch from git." + ) + endif () +endif () + +get_filename_component(PICO_SDK_PATH "${PICO_SDK_PATH}" REALPATH BASE_DIR "${CMAKE_BINARY_DIR}") +if (NOT EXISTS ${PICO_SDK_PATH}) + message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' not found") +endif () + +set(PICO_SDK_INIT_CMAKE_FILE ${PICO_SDK_PATH}/pico_sdk_init.cmake) +if (NOT EXISTS ${PICO_SDK_INIT_CMAKE_FILE}) + message(FATAL_ERROR "Directory '${PICO_SDK_PATH}' does not appear to contain the Raspberry Pi Pico SDK") +endif () + +set(PICO_SDK_PATH ${PICO_SDK_PATH} CACHE PATH "Path to the Raspberry Pi Pico SDK" FORCE) + +include(${PICO_SDK_INIT_CMAKE_FILE})