diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-03-16 15:43:34 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2012-03-19 09:04:56 -0700 |
| commit | 2a9f80d2d990816fe1e5bb1222a6b294673ce7b2 (patch) | |
| tree | d0c6f16db3b667379b598ae5b733c69a6e2ebe68 /chip/lm4/uart.c | |
| parent | eb3920ec7a6a5e3e28529fd51a6c63cb6e7509e4 (diff) | |
| download | chrome-ec-2a9f80d2d990816fe1e5bb1222a6b294673ce7b2.tar.gz | |
More cleanup of board/chip configs and initialization
More modules can be disabled individually through CONFIG_ defines.
Reordered early module pre-init and init, and added comments to
explain why things are ordered in main() the way they are.
Fixed a few assorted init-related bugs along the way, like st32m
keyboard scan double-initializing.
BUG=none
TEST=build link, bds, daisy
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Change-Id: I04a7fa51d743adfab4be4bdddaeef68943b96dec
Diffstat (limited to 'chip/lm4/uart.c')
| -rw-r--r-- | chip/lm4/uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chip/lm4/uart.c b/chip/lm4/uart.c index e3201056fe..fa9ddb005f 100644 --- a/chip/lm4/uart.c +++ b/chip/lm4/uart.c @@ -99,8 +99,7 @@ static void uart_1_interrupt(void) /* Clear transmit and receive interrupt status */ LM4_UART_ICR(1) = 0x70; - /* TODO: (crosbug.com/p/7488) handle input */ - +#ifdef CONFIG_LPC /* If we have space in our FIFO and a character is pending in LPC, * handle that character. */ if (!(LM4_UART_FR(1) & 0x20) && lpc_comx_has_char()) { @@ -115,6 +114,7 @@ static void uart_1_interrupt(void) * on the UART receive-side either. */ if (!(LM4_UART_FR(1) & 0x10)) lpc_comx_put_char(LM4_UART_DR(1)); +#endif } /* Must be same prio as LPC interrupt handler so they don't preempt */ DECLARE_IRQ(LM4_IRQ_UART1, uart_1_interrupt, 2); |