diff options
| author | Nick Sanders <nsanders@chromium.org> | 2017-12-01 17:10:21 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2017-12-03 21:21:27 +0000 |
| commit | 60bccd3851cffd78e605feeb6598761b80e827e7 (patch) | |
| tree | 831a012ad7dc0d8cfd16b972ee68a03d5764cb60 | |
| parent | 8c9f2e505d0f6b0a15052052b779dee93ad2936b (diff) | |
| download | chrome-ec-60bccd3851cffd78e605feeb6598761b80e827e7.tar.gz | |
servo_micro: default to uart enabled.
This allows ec and cpu uart to start enabled,
so console or google serial can be used to log
output without servod.
Rename endpoints to be clearer in the non-servod
usecase. UART1 -> EC, UART2 -> CPU.
BUG=None
BRANCH=servo
TEST:miniterm.py -d /dev/google/Servo_Micro-2-1.2/serial/EC
Change-Id: Ifd3b753a459fdd9b80d84cc6e4ec9cde1ccb74e0
Signed-off-by: Nick Sanders <nsanders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/804899
Reviewed-by: Alexandru M Stan <amstan@chromium.org>
(cherry picked from commit d81dbdff79b1c9d33e436606f8cc9651a3e100e4)
Reviewed-on: https://chromium-review.googlesource.com/804578
| -rw-r--r-- | board/servo_micro/board.c | 8 | ||||
| -rw-r--r-- | board/servo_micro/gpio.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c index 221004bca7..76ec1bd833 100644 --- a/board/servo_micro/board.c +++ b/board/servo_micro/board.c @@ -175,10 +175,10 @@ const void *const usb_strings[] = { [USB_STR_SERIALNO] = 0, [USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32), [USB_STR_I2C_NAME] = USB_STRING_DESC("I2C"), - [USB_STR_USART4_STREAM_NAME] = USB_STRING_DESC("Servo UART3"), - [USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Servo EC Shell"), - [USB_STR_USART3_STREAM_NAME] = USB_STRING_DESC("Servo UART2"), - [USB_STR_USART2_STREAM_NAME] = USB_STRING_DESC("Servo UART1"), + [USB_STR_USART4_STREAM_NAME] = USB_STRING_DESC("UART3"), + [USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Servo Shell"), + [USB_STR_USART3_STREAM_NAME] = USB_STRING_DESC("CPU"), + [USB_STR_USART2_STREAM_NAME] = USB_STRING_DESC("EC"), [USB_STR_UPDATE_NAME] = USB_STRING_DESC("Firmware update"), }; diff --git a/board/servo_micro/gpio.inc b/board/servo_micro/gpio.inc index 8f04214746..598a462421 100644 --- a/board/servo_micro/gpio.inc +++ b/board/servo_micro/gpio.inc @@ -6,12 +6,12 @@ */ /* Outputs */ -GPIO(UART1_EN_L, PIN(A, 8), GPIO_OUT_HIGH) +GPIO(UART1_EN_L, PIN(A, 8), GPIO_OUT_LOW) GPIO(SERVO_JTAG_TRST_L, PIN(A, 13), GPIO_OUT_LOW) GPIO(SPI1_BUF_EN_L, PIN(A, 14), GPIO_OUT_HIGH) GPIO(SPI2_BUF_EN_L, PIN(A, 15), GPIO_OUT_HIGH) -GPIO(UART2_EN_L, PIN(B, 0), GPIO_OUT_HIGH) +GPIO(UART2_EN_L, PIN(B, 0), GPIO_OUT_LOW) GPIO(SPI1_VREF_33, PIN(B, 2), GPIO_OUT_LOW) GPIO(SPI1_VREF_18, PIN(B, 3), GPIO_OUT_LOW) GPIO(SPI2_VREF_33, PIN(B, 4), GPIO_OUT_LOW) |