d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remember where we found the DBGU and use that for our console.

Browse Source
This commit is contained in:
Warner Losh 2012-07-12 19:11:37 +00:00
parent 747943148c
commit 1c882be4bc
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/arm/at91/at91_machdep.c
View File

@ -402,6 +402,7 @@ at91_try_id(uint32_t dbgu_base)
* try to get the matching CPU support. * try to get the matching CPU support.
*/ */
soc_info.soc_data = at91_match_soc(soc_info.type, soc_info.subtype); soc_info.soc_data = at91_match_soc(soc_info.type, soc_info.subtype);
soc_info.dbgu_base = AT91_BASE + dbgu_base;
return (1); return (1);
} }

1
sys/arm/at91/at91var.h
View File

@ -121,6 +121,7 @@ struct at91_soc_info {
uint32_t cidr; uint32_t cidr;
uint32_t exid; uint32_t exid;
char name[AT91_SOC_NAME_MAX]; char name[AT91_SOC_NAME_MAX];
uint32_t dbgu_base;
struct at91_soc_data *soc_data; struct at91_soc_data *soc_data;
}; };

5
sys/arm/at91/uart_cpu_at91rm9200usart.c
View File

@ -71,9 +71,10 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
di->bas.bst = &at91_bs_tag; di->bas.bst = &at91_bs_tag;
/* /*
* XXX: Not pretty, but will work because we map the needed addresses * XXX: Not pretty, but will work because we map the needed addresses
* early. * early. At least we probed this so that the console will work on
* all flavors of Atmel we can detect.
*/ */
di->bas.bsh = AT91_BASE + AT91RM92_DBGU_BASE; di->bas.bsh = soc_info.dbgu_base;
di->baudrate = 115200; di->baudrate = 115200;
di->bas.regshft = 0; di->bas.regshft = 0;
di->bas.rclk = 0; di->bas.rclk = 0;