Skip to content

Commit b66c2d5

Browse files
authored
Merge pull request hathach#1796 from Sinitax/master
Fix ifdefs for disabled uart stdio in rp2040 family
2 parents 8fadaf0 + c01aee6 commit b66c2d5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

hw/bsp/rp2040/board.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
#define BUTTON_BOOTSEL
4141
#define BUTTON_STATE_ACTIVE 0
4242

43-
#if defined(PICO_DEFAULT_UART_TX_PIN) && defined(PICO_DEFAULT_UART_RX_PIN) && defined(PICO_DEFAULT_UART)
43+
#if defined(PICO_DEFAULT_UART_TX_PIN) && defined(PICO_DEFAULT_UART_RX_PIN) && \
44+
defined(PICO_DEFAULT_UART) && defined(LIB_PICO_STDIO_UART)
4445
#define UART_DEV PICO_DEFAULT_UART
4546
#define UART_TX_PIN PICO_DEFAULT_UART_TX_PIN
4647
#define UART_RX_PIN PICO_DEFAULT_UART_RX_PIN

hw/bsp/rp2040/family.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void board_init(void)
148148
#ifndef BUTTON_BOOTSEL
149149
#endif
150150

151-
#if defined(UART_DEV) && defined(LIB_PICO_STDIO_UART)
151+
#ifdef UART_DEV
152152
bi_decl(bi_2pins_with_func(UART_TX_PIN, UART_TX_PIN, GPIO_FUNC_UART));
153153
uart_inst = uart_get_instance(UART_DEV);
154154
stdio_uart_init_full(uart_inst, CFG_BOARD_UART_BAUDRATE, UART_TX_PIN, UART_RX_PIN);

0 commit comments

Comments
 (0)