summaryrefslogtreecommitdiff
path: root/common/lcd.c
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2013-07-01 22:04:05 (GMT)
committerAnatolij Gustschin <agust@denx.de>2013-07-08 18:21:24 (GMT)
commitff8fb56b6f7edafc1bcba8ef008b3f368cabe60d (patch)
tree2db117f992892120bab9ab04b212700642adf0e7 /common/lcd.c
parent327598945b13000065ca6ba3fe96c9bd45320999 (diff)
downloadu-boot-fsl-qoriq-ff8fb56b6f7edafc1bcba8ef008b3f368cabe60d.tar.xz
video: consolidate splash screen alignment code
Code for checking "splashpos" environment variable is duplicated in drivers, move it to the common function. Call this function also in the bmp display command to consider "splashpos" settings. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'common/lcd.c')
-rw-r--r--common/lcd.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 95006aa..50ea4d6 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -1089,23 +1089,8 @@ static void *lcd_logo(void)
return (void *)lcd_base;
addr = simple_strtoul (s, NULL, 16);
-#ifdef CONFIG_SPLASH_SCREEN_ALIGN
- s = getenv("splashpos");
- if (s != NULL) {
- 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 */
+
+ splash_get_pos(&x, &y);
if (bmp_display(addr, x, y) == 0)
return (void *)lcd_base;