diff options
| author | Ha Thach <[email protected]> | 2023-02-22 17:40:54 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-22 17:40:54 +0700 |
| commit | b66c2d5f0ae7cb8f29f305d6998a5d4f462ca6a2 (patch) | |
| tree | 56f32843f882d5596b706e3f5f604db25a5c67ec | |
| parent | 8fadaf01d3cb8d833ff427a7bd3c369a6d0937fc (diff) | |
| parent | c01aee6c1a01884d84b399c005dcfed6e67a908c (diff) | |
Merge pull request #1796 from Sinitax/master
Fix ifdefs for disabled uart stdio in rp2040 family
| -rw-r--r-- | hw/bsp/rp2040/board.h | 3 | ||||
| -rw-r--r-- | hw/bsp/rp2040/family.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/bsp/rp2040/board.h b/hw/bsp/rp2040/board.h index f25f80e09..e7eab088e 100644 --- a/hw/bsp/rp2040/board.h +++ b/hw/bsp/rp2040/board.h @@ -40,7 +40,8 @@ #define BUTTON_BOOTSEL #define BUTTON_STATE_ACTIVE 0 -#if defined(PICO_DEFAULT_UART_TX_PIN) && defined(PICO_DEFAULT_UART_RX_PIN) && defined(PICO_DEFAULT_UART) +#if defined(PICO_DEFAULT_UART_TX_PIN) && defined(PICO_DEFAULT_UART_RX_PIN) && \ + defined(PICO_DEFAULT_UART) && defined(LIB_PICO_STDIO_UART) #define UART_DEV PICO_DEFAULT_UART #define UART_TX_PIN PICO_DEFAULT_UART_TX_PIN #define UART_RX_PIN PICO_DEFAULT_UART_RX_PIN diff --git a/hw/bsp/rp2040/family.c b/hw/bsp/rp2040/family.c index f7ee56990..f9fa88ac4 100644 --- a/hw/bsp/rp2040/family.c +++ b/hw/bsp/rp2040/family.c @@ -148,7 +148,7 @@ void board_init(void) #ifndef BUTTON_BOOTSEL #endif -#if defined(UART_DEV) && defined(LIB_PICO_STDIO_UART) +#ifdef UART_DEV bi_decl(bi_2pins_with_func(UART_TX_PIN, UART_TX_PIN, GPIO_FUNC_UART)); uart_inst = uart_get_instance(UART_DEV); stdio_uart_init_full(uart_inst, CFG_BOARD_UART_BAUDRATE, UART_TX_PIN, UART_RX_PIN); |