summaryrefslogtreecommitdiff
path: root/arch/blackfin/lib
diff options
context:
space:
mode:
Diffstat (limited to 'arch/blackfin/lib')
-rw-r--r--arch/blackfin/lib/board.c3
-rw-r--r--arch/blackfin/lib/boot.c9
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/blackfin/lib/board.c b/arch/blackfin/lib/board.c
index 2d3230c..46e36c8 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 37aa82a..768a882 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);