mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-24 21:50:30 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-video
This commit is contained in:
commit
c6f086ddcb
3
README
3
README
@ -840,6 +840,9 @@ The following options need to be configured:
|
|||||||
CONFIG_CONSOLE_EXTRA_INFO
|
CONFIG_CONSOLE_EXTRA_INFO
|
||||||
additional board info beside
|
additional board info beside
|
||||||
the logo
|
the logo
|
||||||
|
CONFIG_HIDE_LOGO_VERSION
|
||||||
|
do not display bootloader
|
||||||
|
version string
|
||||||
|
|
||||||
When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
|
When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
|
||||||
a limited number of ANSI escape sequences (cursor control,
|
a limited number of ANSI escape sequences (cursor control,
|
||||||
|
@ -24,9 +24,37 @@
|
|||||||
#include <splash.h>
|
#include <splash.h>
|
||||||
#include <lcd.h>
|
#include <lcd.h>
|
||||||
|
|
||||||
|
static struct splash_location default_splash_locations[] = {
|
||||||
|
{
|
||||||
|
.name = "sf",
|
||||||
|
.storage = SPLASH_STORAGE_SF,
|
||||||
|
.flags = SPLASH_STORAGE_RAW,
|
||||||
|
.offset = 0x0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.name = "mmc_fs",
|
||||||
|
.storage = SPLASH_STORAGE_MMC,
|
||||||
|
.flags = SPLASH_STORAGE_FS,
|
||||||
|
.devpart = "0:1",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.name = "usb_fs",
|
||||||
|
.storage = SPLASH_STORAGE_USB,
|
||||||
|
.flags = SPLASH_STORAGE_FS,
|
||||||
|
.devpart = "0:1",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.name = "sata_fs",
|
||||||
|
.storage = SPLASH_STORAGE_SATA,
|
||||||
|
.flags = SPLASH_STORAGE_FS,
|
||||||
|
.devpart = "0:1",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
__weak int splash_screen_prepare(void)
|
__weak int splash_screen_prepare(void)
|
||||||
{
|
{
|
||||||
return 0;
|
return splash_source_load(default_splash_locations,
|
||||||
|
ARRAY_SIZE(default_splash_locations));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
||||||
|
@ -146,7 +146,11 @@ static int splash_init_usb(void)
|
|||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
return usb_stor_scan(1) < 0 ? -ENODEV : 0;
|
#ifndef CONFIG_DM_USB
|
||||||
|
err = usb_stor_scan(1) < 0 ? -ENODEV : 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return err;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static inline int splash_init_usb(void)
|
static inline int splash_init_usb(void)
|
||||||
|
@ -1929,10 +1929,10 @@ static void plot_logo_or_black(void *screen, int x, int y, int black)
|
|||||||
static void *video_logo(void)
|
static void *video_logo(void)
|
||||||
{
|
{
|
||||||
char info[128];
|
char info[128];
|
||||||
int space, len;
|
|
||||||
__maybe_unused int y_off = 0;
|
__maybe_unused int y_off = 0;
|
||||||
__maybe_unused ulong addr;
|
__maybe_unused ulong addr;
|
||||||
__maybe_unused char *s;
|
__maybe_unused char *s;
|
||||||
|
__maybe_unused int len, space;
|
||||||
|
|
||||||
splash_get_pos(&video_logo_xpos, &video_logo_ypos);
|
splash_get_pos(&video_logo_xpos, &video_logo_ypos);
|
||||||
|
|
||||||
@ -1978,6 +1978,7 @@ static void *video_logo(void)
|
|||||||
|
|
||||||
sprintf(info, " %s", version_string);
|
sprintf(info, " %s", version_string);
|
||||||
|
|
||||||
|
#ifndef CONFIG_HIDE_LOGO_VERSION
|
||||||
space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH;
|
space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH;
|
||||||
len = strlen(info);
|
len = strlen(info);
|
||||||
|
|
||||||
@ -2026,6 +2027,7 @@ static void *video_logo(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return (video_fb_address + video_logo_height * VIDEO_LINE_LEN);
|
return (video_fb_address + video_logo_height * VIDEO_LINE_LEN);
|
||||||
|
@ -47,7 +47,16 @@ struct splash_location {
|
|||||||
char *ubivol; /* UBI volume-name for ubifsmount */
|
char *ubivol; /* UBI volume-name for ubifsmount */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_SPLASH_SOURCE
|
||||||
int splash_source_load(struct splash_location *locations, uint size);
|
int splash_source_load(struct splash_location *locations, uint size);
|
||||||
|
#else
|
||||||
|
static inline int splash_source_load(struct splash_location *locations,
|
||||||
|
uint size)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int splash_screen_prepare(void);
|
int splash_screen_prepare(void);
|
||||||
|
|
||||||
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
||||||
|
Loading…
Reference in New Issue
Block a user