diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-07-07 22:32:34 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-07-09 10:58:14 -0700 |
| commit | 46bc2721c521bf84c654172addbef939de33b3d1 (patch) | |
| tree | bbae6c1628afbbdaa8926f870d3002aefcd9ca99 | |
| parent | f8a4b6bf5135bc608916c7d28c2577112fdb94b9 (diff) | |
| download | chrome-ec-46bc2721c521bf84c654172addbef939de33b3d1.tar.gz | |
Remove unused UART defines
No longer needed since the rewrite of the panic handler in C.
BUG=none
TEST=link and snow still compile
Change-Id: Ib790004ae4d0ba11f0800e85e14ea372a53025f8
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/26890
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | chip/lm4/config.h | 6 | ||||
| -rw-r--r-- | chip/lm4/uart.c | 6 | ||||
| -rw-r--r-- | chip/stm32/config-stm32f100.h | 6 | ||||
| -rw-r--r-- | chip/stm32/config-stm32l15x.h | 6 | ||||
| -rw-r--r-- | chip/stm32/uart.c | 6 |
5 files changed, 0 insertions, 30 deletions
diff --git a/chip/lm4/config.h b/chip/lm4/config.h index 667a0890fe..be2fefc36e 100644 --- a/chip/lm4/config.h +++ b/chip/lm4/config.h @@ -12,12 +12,6 @@ /* Number of IRQ vectors on the NVIC */ #define CONFIG_IRQ_COUNT 132 -/* Debug UART parameters for panic message */ -#define CONFIG_UART_ADDRESS 0x4000c000 -#define CONFIG_UART_DR_OFFSET 0x00 -#define CONFIG_UART_SR_OFFSET 0x18 -#define CONFIG_UART_SR_TXEMPTY 0x80 - /* Use a bigger console output buffer */ #define CONFIG_UART_TX_BUF_SIZE 1024 diff --git a/chip/lm4/uart.c b/chip/lm4/uart.c index 25e04da908..5e59d5a502 100644 --- a/chip/lm4/uart.c +++ b/chip/lm4/uart.c @@ -149,12 +149,6 @@ int uart_init(void) volatile uint32_t scratch __attribute__((unused)); int ch; - /* - * Check that the UART parameters used for panic/watchdog are matching - * the UART0 parameters. - */ - BUILD_ASSERT(LM4_UART_CH0_BASE == CONFIG_UART_ADDRESS); - /* Enable UART0 and UART1 and delay a few clocks */ LM4_SYSTEM_RCGCUART |= 0x03; scratch = LM4_SYSTEM_RCGCUART; diff --git a/chip/stm32/config-stm32f100.h b/chip/stm32/config-stm32f100.h index 51e4420537..b9b67ebc15 100644 --- a/chip/stm32/config-stm32f100.h +++ b/chip/stm32/config-stm32f100.h @@ -40,9 +40,3 @@ /* Number of IRQ vectors on the NVIC */ #define CONFIG_IRQ_COUNT 61 - -/* Debug UART parameters for panic message */ -#define CONFIG_UART_ADDRESS 0x40013800 /* USART1 */ -#define CONFIG_UART_DR_OFFSET 0x04 -#define CONFIG_UART_SR_OFFSET 0x00 -#define CONFIG_UART_SR_TXEMPTY 0x80 diff --git a/chip/stm32/config-stm32l15x.h b/chip/stm32/config-stm32l15x.h index 7bbb7e4f09..8e40b9778f 100644 --- a/chip/stm32/config-stm32l15x.h +++ b/chip/stm32/config-stm32l15x.h @@ -37,9 +37,3 @@ /* Number of IRQ vectors on the NVIC */ #define CONFIG_IRQ_COUNT 45 - -/* Debug UART parameters for panic message */ -#define CONFIG_UART_ADDRESS 0x40013800 /* USART1 */ -#define CONFIG_UART_DR_OFFSET 0x04 -#define CONFIG_UART_SR_OFFSET 0x00 -#define CONFIG_UART_SR_TXEMPTY 0x80 diff --git a/chip/stm32/uart.c b/chip/stm32/uart.c index 82460888c9..176e0afcf3 100644 --- a/chip/stm32/uart.c +++ b/chip/stm32/uart.c @@ -111,12 +111,6 @@ DECLARE_IRQ(STM32_IRQ_USART(UARTN), uart_interrupt, 1); int uart_init(void) { - /* - * Check that the UART parameters used for panic/watchdog are matching - * the console USART parameters. - */ - BUILD_ASSERT(STM32_USART_BASE(UARTN) == CONFIG_UART_ADDRESS); - /* Enable USART clock */ if (UARTN == 1) STM32_RCC_APB2ENR |= 1 << 14; /* USART1 */ |