diff options
author | wdenk <wdenk> | 2004-11-21 00:06:33 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2004-11-21 00:06:33 +0000 |
commit | 9d5028c2f7a65d3777867a6cfc966a01a5823132 (patch) | |
tree | c971cc2b0d41e422585c1911fffda7d2d6403ee4 /cpu/at91rm9200/serial.c | |
parent | cacfab588a897c369a4906818c5ed4bc40a450c5 (diff) |
* Update for AT91RM9200DK and CMC_PU2 boards:
- Enable booting directly from flash
- fix CMC_PU2 flash driver
* Fix mkimage usage message
Diffstat (limited to 'cpu/at91rm9200/serial.c')
-rw-r--r-- | cpu/at91rm9200/serial.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cpu/at91rm9200/serial.c b/cpu/at91rm9200/serial.c index fb038510c48..a9693bf44e3 100644 --- a/cpu/at91rm9200/serial.c +++ b/cpu/at91rm9200/serial.c @@ -55,17 +55,11 @@ void serial_setbrg (void) if ((baudrate = gd->baudrate) <= 0) baudrate = CONFIG_BAUDRATE; - if (baudrate == CONFIG_BAUDRATE) { + if (baudrate == 0 || baudrate == CONFIG_BAUDRATE) us->US_BRGR = CFG_AT91C_BRGR_DIVISOR; /* hardcode so no __divsi3 */ - } else { -#if 0 - /* 33 -> 115200 */ - us->US_BRGR = 33 * (115200/baudrate); -#else + else /* MASTER_CLOCK/(16 * baudrate) */ us->US_BRGR = (AT91C_MASTER_CLOCK >> 4)/baudrate; -#endif - } } int serial_init (void) |