diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-05-24 15:05:19 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-05-24 15:05:19 +0000 |
| commit | d17733ccd8ebc56809aec8dd6bb681ff6f23b673 (patch) | |
| tree | 3f74c53181b626b226660c8f6c8d6b241132532f /c/src/lib/libbsp/sparc/leon3/amba/amba.c | |
| parent | Regenerate. (diff) | |
| download | rtems-d17733ccd8ebc56809aec8dd6bb681ff6f23b673.tar.bz2 | |
2010-05-24 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, amba/amba.c, console/console.c, console/debugputs.c,
startup/bspstart.c: Rework initialization order so AMBA bus is
scanned earlier. This lets us look for UARTs earlier and support
printk as early as bsp_start() returning.
Diffstat (limited to 'c/src/lib/libbsp/sparc/leon3/amba/amba.c')
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/amba/amba.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/sparc/leon3/amba/amba.c b/c/src/lib/libbsp/sparc/leon3/amba/amba.c index ad901df1c0..6f86e27ded 100644 --- a/c/src/lib/libbsp/sparc/leon3/amba/amba.c +++ b/c/src/lib/libbsp/sparc/leon3/amba/amba.c @@ -24,9 +24,9 @@ volatile LEON3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs; int LEON3_Cpu_Index = 0; /* - * bsp_predriver_hook + * amba_initialize * - * BSP predriver hook. Called just before drivers are initialized. + * Must be called just before drivers are initialized. * Used to scan system bus. Probes for AHB masters, AHB slaves and * APB slaves. Addresses to configuration areas of the AHB masters, * AHB slaves, APB slaves and APB master are storeds in @@ -43,8 +43,9 @@ asm(" .text \n" extern rtems_configuration_table Configuration; +extern int scan_uarts(void); -void bsp_predriver_hook(void) +void amba_initialize(void) { int i; amba_apb_device dev; @@ -71,4 +72,6 @@ void bsp_predriver_hook(void) LEON3_Timer_Regs = (volatile LEON3_Timer_Regs_Map *) dev.start; } + /* find UARTS */ + scan_uarts(); } |