diff options
| author | Todd Broch <tbroch@google.com> | 2019-03-01 18:56:31 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-06 06:51:20 -0800 |
| commit | a7d8d3a0c1be573ae1a113a611acd4f7652949de (patch) | |
| tree | b581f57960712d257c9a3540eda06cc36ca5e034 | |
| parent | 6e41e378b5973b3968977ca68101fcd775b98aba (diff) | |
| download | chrome-ec-a7d8d3a0c1be573ae1a113a611acd4f7652949de.tar.gz | |
Revert "Servo v4: reduce RO flash size"
This reverts commit 590a45db85507787af77cf6bfc8ae63499cbf1cc.
BRANCH=none
BUG=b:124465253
TEST=manual,
Running
sudo servo_updater -b servo_v4 --force -f build/servo_v4/ec.bin
sudo servo_updater -b servo_v4 --force -f build/servo_v4/ec.bin
passes without failure,
servo_updater.ServoUpdaterException: usb_updater2 exit with res = 3
Change-Id: Ied9939192c30342bb6314e6dccfcd56d950659ab
Signed-off-by: Todd Broch <tbroch@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1497438
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Todd Broch <tbroch@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
| -rw-r--r-- | board/servo_v4/board.c | 8 | ||||
| -rw-r--r-- | board/servo_v4/board.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index 84a78fe9e8..982ed9ccfb 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -97,7 +97,7 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /****************************************************************************** * Forward USART3 as a simple USB serial interface. */ -#ifdef SECTION_IS_RW + static struct usart_config const usart3; struct usb_stream_config const usart3_usb; @@ -123,7 +123,7 @@ USB_STREAM_CONFIG(usart3_usb, USB_STREAM_TX_SIZE, usb_to_usart3, usart3_to_usb) -#endif /* SECTION_IS_RW */ + /****************************************************************************** * Forward USART4 as a simple USB serial interface. @@ -412,17 +412,13 @@ int board_get_version(void) static void board_init(void) { /* USB to serial queues */ -#ifdef SECTION_IS_RW queue_init(&usart3_to_usb); queue_init(&usb_to_usart3); -#endif queue_init(&usart4_to_usb); queue_init(&usb_to_usart4); /* UART init */ -#ifdef SECTION_IS_RW usart_init(&usart3); -#endif usart_init(&usart4); /* Delay DUT hub to avoid brownout. */ diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index 9e9f56d15a..e131384e8f 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -22,9 +22,7 @@ /* Enable USART1,3,4 and USB streams */ #define CONFIG_STREAM_USART -#ifdef SECTION_IS_RW #define CONFIG_STREAM_USART3 -#endif #define CONFIG_STREAM_USART4 #define CONFIG_STREAM_USB #define CONFIG_CMD_USART_INFO |