diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-13 10:04:34 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-13 10:04:34 -0500 |
| commit | 618a51e9aefe1e03f498ea48bfab70a0b2c9be39 (patch) | |
| tree | 565050bbf77d0d7f5d041bf490c3b6f8c83f6319 /common/board_r.c | |
| parent | b67dfc5a1099eef2a323de23a78ba4e6d9b87633 (diff) | |
| parent | e43ce3fca755d79635899b658a97f3c4a7dbf220 (diff) | |
| download | blackbird-obmc-uboot-618a51e9aefe1e03f498ea48bfab70a0b2c9be39.tar.gz blackbird-obmc-uboot-618a51e9aefe1e03f498ea48bfab70a0b2c9be39.zip | |
Merge branch 'series1_v2' of git://git.denx.de/u-boot-sparc
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c index 2270e2ed0f..c6aa7e5224 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -46,6 +46,9 @@ #include <stdio_dev.h> #include <trace.h> #include <watchdog.h> +#ifdef CONFIG_CMD_AMBAPP +#include <ambapp.h> +#endif #ifdef CONFIG_ADDR_MAP #include <asm/mmu.h> #endif @@ -559,6 +562,18 @@ static int initr_status_led(void) } #endif +#if defined(CONFIG_CMD_AMBAPP) && defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP) +extern int do_ambapp_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); + +static int initr_ambapp_print(void) +{ + puts("AMBA:\n"); + do_ambapp_print(NULL, 0, 0, NULL); + + return 0; +} +#endif + #if defined(CONFIG_CMD_SCSI) static int initr_scsi(void) { @@ -850,6 +865,12 @@ init_fnc_t init_sequence_r[] = { #ifdef CONFIG_BOARD_LATE_INIT board_late_init, #endif +#if defined(CONFIG_CMD_AMBAPP) + ambapp_init_reloc, +#if defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP) + initr_ambapp_print, +#endif +#endif #ifdef CONFIG_CMD_SCSI INIT_FUNC_WATCHDOG_RESET initr_scsi, |
