mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-02 04:21:48 +02:00
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35. Reported-by: Jonas Karlman <jonas@kwiboo.se> Signed-off-by: Tom Rini <trini@konsulko.com>
194 lines
4.2 KiB
C
194 lines
4.2 KiB
C
/*
|
|
* Copyright (C) 2013, Boundary Devices <info@boundarydevices.com>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., http://www.fsf.org/about/contact/
|
|
*
|
|
*/
|
|
|
|
#include <display_options.h>
|
|
#include <env.h>
|
|
#include <splash.h>
|
|
#include <video.h>
|
|
#include <vsprintf.h>
|
|
#include <linux/kernel.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 = "mmc_raw",
|
|
.storage = SPLASH_STORAGE_MMC,
|
|
.flags = SPLASH_STORAGE_RAW,
|
|
.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",
|
|
},
|
|
};
|
|
|
|
#ifdef CONFIG_VIDEO_LOGO
|
|
|
|
#include <bmp_logo_data.h>
|
|
|
|
static int splash_video_logo_load(void)
|
|
{
|
|
char *splashimage;
|
|
ulong bmp_load_addr;
|
|
|
|
splashimage = env_get("splashimage");
|
|
if (!splashimage)
|
|
return -ENOENT;
|
|
|
|
bmp_load_addr = hextoul(splashimage, 0);
|
|
if (!bmp_load_addr) {
|
|
printf("Error: bad 'splashimage' address\n");
|
|
return -EFAULT;
|
|
}
|
|
|
|
memcpy((void *)bmp_load_addr, bmp_logo_bitmap,
|
|
ARRAY_SIZE(bmp_logo_bitmap));
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
static inline int splash_video_logo_load(void) { return -ENOSYS; }
|
|
#endif
|
|
|
|
__weak int splash_screen_prepare(void)
|
|
{
|
|
if (CONFIG_IS_ENABLED(SPLASH_SOURCE))
|
|
return splash_source_load(default_splash_locations,
|
|
ARRAY_SIZE(default_splash_locations));
|
|
|
|
return splash_video_logo_load();
|
|
}
|
|
|
|
void splash_get_pos(int *x, int *y)
|
|
{
|
|
char *s = env_get("splashpos");
|
|
|
|
if (!CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) || !s)
|
|
return;
|
|
|
|
if (s[0] == 'm')
|
|
*x = BMP_ALIGN_CENTER;
|
|
else
|
|
*x = simple_strtol(s, NULL, 0);
|
|
|
|
s = strchr(s + 1, ',');
|
|
if (s != NULL) {
|
|
if (s[1] == 'm')
|
|
*y = BMP_ALIGN_CENTER;
|
|
else
|
|
*y = simple_strtol(s + 1, NULL, 0);
|
|
}
|
|
}
|
|
|
|
#if CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(HIDE_LOGO_VERSION)
|
|
|
|
#ifdef CONFIG_VIDEO_LOGO
|
|
#include <bmp_logo.h>
|
|
#endif
|
|
#include <dm.h>
|
|
#include <video_console.h>
|
|
#include <video_font.h>
|
|
#include <video_font_data.h>
|
|
|
|
void splash_display_banner(void)
|
|
{
|
|
struct video_fontdata __maybe_unused *fontdata = fonts;
|
|
struct udevice *dev;
|
|
char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
|
|
int col, row, ret;
|
|
|
|
ret = uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &dev);
|
|
if (ret)
|
|
return;
|
|
|
|
#if IS_ENABLED(CONFIG_VIDEO_LOGO)
|
|
col = BMP_LOGO_WIDTH / fontdata->width + 1;
|
|
row = BMP_LOGO_HEIGHT / fontdata->height + 1;
|
|
#else
|
|
col = 0;
|
|
row = 0;
|
|
#endif
|
|
|
|
display_options_get_banner(false, buf, sizeof(buf));
|
|
vidconsole_position_cursor(dev, col, 1);
|
|
vidconsole_put_string(dev, buf);
|
|
vidconsole_position_cursor(dev, 0, row);
|
|
}
|
|
#endif /* CONFIG_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
|
|
|
|
/*
|
|
* Common function to show a splash image if env("splashimage") is set.
|
|
* For additional details please refer to doc/README.splashprepare.
|
|
*/
|
|
int splash_display(void)
|
|
{
|
|
ulong addr;
|
|
char *s;
|
|
int x = 0, y = 0, ret;
|
|
if (!CONFIG_IS_ENABLED(SPLASH_SCREEN))
|
|
return -ENOSYS;
|
|
s = env_get("splashimage");
|
|
if (!s)
|
|
return -EINVAL;
|
|
|
|
addr = hextoul(s, NULL);
|
|
ret = splash_screen_prepare();
|
|
if (ret)
|
|
return ret;
|
|
|
|
splash_get_pos(&x, &y);
|
|
|
|
if (CONFIG_IS_ENABLED(BMP))
|
|
ret = bmp_display(addr, x, y);
|
|
else
|
|
return -ENOSYS;
|
|
|
|
/* Skip banner output on video console if the logo is not at 0,0 */
|
|
if (x || y)
|
|
goto end;
|
|
|
|
#if CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(HIDE_LOGO_VERSION)
|
|
splash_display_banner();
|
|
#endif
|
|
end:
|
|
return ret;
|
|
}
|