diff options
| author | wdenk <wdenk> | 2004-10-10 17:05:18 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-10-10 17:05:18 +0000 |
| commit | 2cbe571a5676a41aa32ff98e9b1a2934e3922574 (patch) | |
| tree | 5868352e056b89c43cebc14378821ff08534dd92 /cpu/at91rm9200/cpu.c | |
| parent | 659883c2982db64e9950434cba2a72a3dae84a7e (diff) | |
| download | u-boot-imx-2cbe571a5676a41aa32ff98e9b1a2934e3922574.zip u-boot-imx-2cbe571a5676a41aa32ff98e9b1a2934e3922574.tar.gz u-boot-imx-2cbe571a5676a41aa32ff98e9b1a2934e3922574.tar.bz2 | |
* Patch by Gary Jennejohn, 01 Oct 2004:
- add support for CMC PU2 board
- add support for I2C on at91rm9200
* Patch by Gary Jennejohn, 28 Sep 2004:
fix baudrate handling on at91rm9200
Diffstat (limited to 'cpu/at91rm9200/cpu.c')
| -rw-r--r-- | cpu/at91rm9200/cpu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpu/at91rm9200/cpu.c b/cpu/at91rm9200/cpu.c index c006d9c..a7e2ca9 100644 --- a/cpu/at91rm9200/cpu.c +++ b/cpu/at91rm9200/cpu.c @@ -35,8 +35,8 @@ #include <asm/io.h> #include <asm/arch/hardware.h> -#if !defined(CONFIG_DBGU) && !defined(CONFIG_USART1) -#error must define one of CONFIG_DBGU or CONFIG_USART1 +#if !defined(CONFIG_DBGU) && !defined(CONFIG_USART0) && !defined(CONFIG_USART1) +#error must define one of CONFIG_DBGU or CONFIG_USART0 or CONFIG_USART1 #endif /* read co-processor 15, register #1 (control register) */ @@ -123,6 +123,9 @@ int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) #ifdef CONFIG_DBGU AT91PS_USART us = AT91C_BASE_DBGU; #endif +#ifdef CONFIG_USART0 + AT91PS_USART us = AT91C_BASE_US0; +#endif #ifdef CONFIG_USART1 AT91PS_USART us = AT91C_BASE_US1; #endif |