mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
7bf71d1f55
lcd_logo() currently performs tasks well beyond just displaying the logo. It has code which displays splash image, it has logic which determines when the different display features are displayed, and it is coupled with the lcd console because it holds the responsibility of returning the lcd console base address. Make lcd_logo() just about the logo by: * Moving splash image display code into a dedicated function * Moving the logic regarding when various features are displayed to lcd_clear() (which is arguably not the correct name for housing such code either, but it is currently the most fitting location code wise) * Move the responsibility of setting the console base address to lcd_clear() too. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Bo Shen <voice.shen@atmel.com> Tested-by: Josh Wu <josh.wu@atmel.com> Cc: Bo Shen <voice.shen@atmel.com> Cc: Simon Glass <sjg@chromium.org> Cc: Anatolij Gustschin <agust@denx.de>
69 lines
1.6 KiB
C
69 lines
1.6 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>
|
|
|
|
__weak int splash_screen_prepare(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
|
|
void splash_get_pos(int *x, int *y)
|
|
{
|
|
char *s = getenv("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
|