projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Blackfin: shutdown video DMA when booting Linux
[oweals/u-boot.git]
/
arch
/
blackfin
/
lib
/
boot.c
diff --git
a/arch/blackfin/lib/boot.c
b/arch/blackfin/lib/boot.c
index 951d5b0d02732cfadaf8a741016d5a289514bf39..768a8826b55c1ac94814f9a56b7033efddf9bd9d 100644
(file)
--- a/
arch/blackfin/lib/boot.c
+++ b/
arch/blackfin/lib/boot.c
@@
-18,6
+18,10
@@
extern void swap_to(int device_id);
#endif
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;
static char *make_command_line(void)
{
char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR;
@@
-33,7
+37,7
@@
static char *make_command_line(void)
extern ulong bfin_poweron_retx;
extern ulong bfin_poweron_retx;
-int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
+int do_bootm_linux(int flag, int argc, char *
const
argv[], bootm_headers_t *images)
{
int (*appl) (char *cmdline);
char *cmdline;
{
int (*appl) (char *cmdline);
char *cmdline;
@@
-45,6
+49,11
@@
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
swap_to(FLASH);
#endif
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);
appl = (int (*)(char *))images->ep;
printf("Starting Kernel at = %p\n", appl);