diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-18 21:19:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-18 21:19:00 +0200 |
| commit | 5549d22b656550d36b2cc46743c7220ab0e9dcc4 (patch) | |
| tree | acc88f5980b8ca5999e05e9a86429e5b397cdd7e /arch/blackfin | |
| parent | ae37a0704a8a27e47471f541a68b88370cd14aa8 (diff) | |
| parent | 9ce2c4b7f79c5bdc1697a6979a0d33e51c3cf57d (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/lib/board.c | 3 | ||||
| -rw-r--r-- | arch/blackfin/lib/boot.c | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c index 2d3230cd64..46e36c8904 100644 --- a/arch/blackfin/lib/board.c +++ b/arch/blackfin/lib/board.c @@ -53,9 +53,10 @@ static inline void serial_early_puts(const char *s) static int display_banner(void) { printf("\n\n%s\n\n", version_string); - printf("CPU: ADSP " MK_STR(CONFIG_BFIN_CPU) " " + printf("CPU: ADSP %s " "(Detected Rev: 0.%d) " "(%s boot)\n", + gd->bd->bi_cpu, bfin_revid(), get_bfin_boot_mode(CONFIG_BFIN_BOOT_MODE)); return 0; diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c index 37aa82a055..768a8826b5 100644 --- a/arch/blackfin/lib/boot.c +++ b/arch/blackfin/lib/boot.c @@ -18,6 +18,10 @@ extern void swap_to(int device_id); #endif +#ifdef CONFIG_VIDEO +extern void video_stop(void); +#endif + static char *make_command_line(void) { char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR; @@ -45,6 +49,11 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima swap_to(FLASH); #endif +#ifdef CONFIG_VIDEO + /* maybe this should be standardized and moved to bootm ... */ + video_stop(); +#endif + appl = (int (*)(char *))images->ep; printf("Starting Kernel at = %p\n", appl); |