diff options
| author | Bhanu Prakash Maiya <bhanumaiya@google.com> | 2020-04-01 23:41:10 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-06 05:17:43 +0000 |
| commit | 32b54e8ad9d09f994c301d6d6ec822692bb1919a (patch) | |
| tree | aec93bbda9104180617b09e0fef45fe559cdd5fb | |
| parent | 8db6eb89540a0ca72e29633ffbfd1eac10d6ad6a (diff) | |
| download | chrome-ec-32b54e8ad9d09f994c301d6d6ec822692bb1919a.tar.gz | |
Bloonchipper: Change console from uart1 to uart2
Bloonchipper uses both uart ports on STM32. Debug console should now
work on uart2 which is connected to servo connector.
BRANCH=none
BUG=b:147849609
TEST=Access console on uart2.
Signed-off-by: Bhanu Prakash Maiya <bhanumaiya@google.com>
Change-Id: I26b7989051404224f9bf608ce02d35af2bb566f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2133589
Reviewed-by: Craig Hesling <hesling@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Tested-by: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
Auto-Submit: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
Commit-Queue: Tom Hughes <tomhughes@chromium.org>
| -rw-r--r-- | board/hatch_fp/board.h | 10 | ||||
| -rw-r--r-- | board/hatch_fp/gpio.inc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h index da459e80aa..164abbf334 100644 --- a/board/hatch_fp/board.h +++ b/board/hatch_fp/board.h @@ -92,17 +92,17 @@ * UART Console Setup *-------------------------------------------------------------------------*/ -/* The UART console is on USART1 */ +/* The UART console is on USART2 */ #undef CONFIG_UART_CONSOLE -#define CONFIG_UART_CONSOLE 1 +#define CONFIG_UART_CONSOLE 2 #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 2048 -#define CONFIG_UART_TX_REQ_CH 4 -#define CONFIG_UART_RX_REQ_CH 4 /* We don't currently use DMA. */ -#define CONFIG_UART_TX_DMA_PH DMAMUX1_REQ_USART1_TX +#undef CONFIG_UART_TX_DMA_PH #undef CONFIG_UART_TX_DMA #undef CONFIG_UART_RX_DMA +#undef CONFIG_UART_TX_REQ_CH +#undef CONFIG_UART_RX_REQ_CH /*-------------------------------------------------------------------------* * Console Commands diff --git a/board/hatch_fp/gpio.inc b/board/hatch_fp/gpio.inc index fb5aef0ecb..3f00642b69 100644 --- a/board/hatch_fp/gpio.inc +++ b/board/hatch_fp/gpio.inc @@ -28,8 +28,6 @@ GPIO(USER_PRES_L, PIN(B, 9), GPIO_ODR_HIGH) * look at "USING STM32F4 MCU POWER MODES WITH BEST DYNAMIC EFFICIENCY" * ("AN4365") section 1.2.6 and STM32F412 reference manual section 7.3.12. */ -UNUSED(PIN(A, 2)) -UNUSED(PIN(A, 3)) UNUSED(PIN(B, 2)) UNUSED(PIN(B, 5)) UNUSED(PIN(C, 13)) @@ -40,8 +38,10 @@ UNUSED(PIN(H, 1)) UNIMPLEMENTED(ENTERING_RW) -/* USART1: PA9/PA10 (TX/RX) */ +/* USART1: PA9/PA10 (TX/RX) to AP*/ ALTERNATE(PIN_MASK(A, 0x0600), GPIO_ALT_USART, MODULE_UART, GPIO_PULL_UP) +/* USART2: PA2/PA3 (TX/RX) to servo*/ +ALTERNATE(PIN_MASK(A, 0x000C), GPIO_ALT_USART, MODULE_UART, GPIO_PULL_UP) /* SPI1 slave from the AP: PA4/5/6/7 (CS/CLK/MISO/MOSI) */ ALTERNATE(PIN_MASK(A, 0x00f0), GPIO_ALT_SPI, MODULE_SPI, 0) /* |