summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorNikita Kiryanov <nikita@compulab.co.il>2013-02-24 21:28:43 +0000
committerTom Rini <trini@ti.com>2013-03-11 11:06:09 -0400
commitc08804853361bb7c6e2f9e0cdcdc0b327f71fe35 (patch)
treec534705bdd53f50cdf361b5715b93aaa46a055ed /common
parent48ec52910047e048a5857fdaf00679b85a952ec5 (diff)
downloadu-boot-imx-c08804853361bb7c6e2f9e0cdcdc0b327f71fe35.zip
u-boot-imx-c08804853361bb7c6e2f9e0cdcdc0b327f71fe35.tar.gz
u-boot-imx-c08804853361bb7c6e2f9e0cdcdc0b327f71fe35.tar.bz2
lcd: implement a callback for splashimage
On some architectures certain values of splashimage will lead to a data abort exception. Document the problem, and implement a callback for splashimage to reject such values. Cc: Anatolij Gustschin <agust@denx.de> Cc: Wolfgang Denk <wd@denx.de> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'common')
-rw-r--r--common/lcd.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/common/lcd.c b/common/lcd.c
index ba6975b..590bbb9 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -33,6 +33,8 @@
#include <common.h>
#include <command.h>
#include <stdarg.h>
+#include <search.h>
+#include <env_callback.h>
#include <linux/types.h>
#include <stdio_dev.h>
#if defined(CONFIG_POST)
@@ -1099,6 +1101,30 @@ static void *lcd_logo(void)
#endif /* CONFIG_LCD_LOGO && !CONFIG_LCD_INFO_BELOW_LOGO */
}
+#ifdef CONFIG_SPLASHIMAGE_GUARD
+static int on_splashimage(const char *name, const char *value, enum env_op op,
+ int flags)
+{
+ ulong addr;
+ int aligned;
+
+ if (op == env_op_delete)
+ return 0;
+
+ addr = simple_strtoul(value, NULL, 16);
+ /* See README.displaying-bmps */
+ aligned = (addr % 4 == 2);
+ if (!aligned) {
+ printf("Invalid splashimage value. Value must be 16 bit aligned, but not 32 bit aligned\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+U_BOOT_ENV_CALLBACK(splashimage, on_splashimage);
+#endif
+
void lcd_position_cursor(unsigned col, unsigned row)
{
console_col = min(col, CONSOLE_COLS - 1);