00caae6d47
We are now using an env_ prefix for environment functions. Rename these two functions for consistency. Also add function comments in common.h. Quite a few places use getenv() in a condition context, provoking a warning from checkpatch. These are fixed up in this patch also. Suggested-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Simon Glass <sjg@chromium.org>
97 lines
2.1 KiB
C
97 lines
2.1 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 <common.h>
|
|
#include <splash.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)
|
|
{
|
|
return splash_source_load(default_splash_locations,
|
|
ARRAY_SIZE(default_splash_locations));
|
|
}
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
|
void splash_get_pos(int *x, int *y)
|
|
{
|
|
char *s = env_get("splashpos");
|
|
|
|
if (!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);
|
|
}
|
|
}
|
|
#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
|
|
|
|
#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD)
|
|
int lcd_splash(ulong addr)
|
|
{
|
|
int x = 0, y = 0, ret;
|
|
|
|
ret = splash_screen_prepare();
|
|
if (ret)
|
|
return ret;
|
|
|
|
splash_get_pos(&x, &y);
|
|
|
|
return bmp_display(addr, x, y);
|
|
}
|
|
#endif
|