Patchwork [U-Boot,V2,7/7] cm-t35: add support for loading splash image from NAND

login
register
mail settings
Submitter Nikita Kiryanov
Date Jan. 29, 2013, 12:42 p.m.
Message ID <1359463349-11649-8-git-send-email-nikita@compulab.co.il>
Download mbox | patch
Permalink /patch/216520/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Nikita Kiryanov - Jan. 29, 2013, 12:42 p.m.
Add support for loading splash image from NAND

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
---
Changes in V2:
	- Added fix to bmp_load_addr to comply with what happens in lcd.c
	following patch number 3.

 board/cm_t35/cm_t35.c    |   65 ++++++++++++++++++++++++++++++++++++++++++++++
 include/configs/cm_t35.h |    4 +++
 2 files changed, 69 insertions(+)
Wolfgang Denk - Jan. 29, 2013, 1:50 p.m.
Dear Nikita Kiryanov,

In message <1359463349-11649-8-git-send-email-nikita@compulab.co.il> you wrote:
> Add support for loading splash image from NAND
> 
> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
> Changes in V2:
> 	- Added fix to bmp_load_addr to comply with what happens in lcd.c
> 	following patch number 3.
> 
>  board/cm_t35/cm_t35.c    |   65 ++++++++++++++++++++++++++++++++++++++++++++++
>  include/configs/cm_t35.h |    4 +++
>  2 files changed, 69 insertions(+)

Why exactly do you need to add code here?

Is it not sufficient to add, for example, a "nand read" command as
part of your "preboot" settings?

Best regards,

Wolfgang Denk
Nikita Kiryanov - Jan. 30, 2013, 8:08 a.m.
Hi Wolfgang Denk,

On 01/29/2013 03:50 PM, Wolfgang Denk wrote:
> Dear Nikita Kiryanov,
>
> In message <1359463349-11649-8-git-send-email-nikita@compulab.co.il> you wrote:
>> Add support for loading splash image from NAND
>>
>> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
>> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
>> ---
>> Changes in V2:
>> 	- Added fix to bmp_load_addr to comply with what happens in lcd.c
>> 	following patch number 3.
>>
>>   board/cm_t35/cm_t35.c    |   65 ++++++++++++++++++++++++++++++++++++++++++++++
>>   include/configs/cm_t35.h |    4 +++
>>   2 files changed, 69 insertions(+)
>
> Why exactly do you need to add code here?
>
> Is it not sufficient to add, for example, a "nand read" command as
> part of your "preboot" settings?

The preboot commands are executed after lcd is turned on; ideally, the
splashimage should be in the frame buffer before that. There is also
the issue of having to fix the bmp load address to the appropriate
alignment (to comply with a similar fix in lcd.c from patch 3), and
checking for problems such as overwriting U-Boot data with the bmp. I
don't think Hush is the right tool for these actions.

>
> Best regards,
>
> Wolfgang Denk
>

Patch

diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c
index 8f3d735..9ad5cbe 100644
--- a/board/cm_t35/cm_t35.c
+++ b/board/cm_t35/cm_t35.c
@@ -33,7 +33,9 @@ 
 #include <net.h>
 #include <i2c.h>
 #include <usb.h>
+#include <nand.h>
 #include <twl4030.h>
+#include <bmp_layout.h>
 #include <linux/compiler.h>
 
 #include <asm/io.h>
@@ -75,6 +77,69 @@  static u32 gpmc_nand_config[GPMC_MAX_REG] = {
 	0,
 };
 
+#ifdef CONFIG_LCD
+#ifdef CONFIG_CMD_NAND
+static int splash_load_from_nand(u32 bmp_load_addr)
+{
+	struct bmp_header *bmp_hdr;
+	int res, splash_screen_nand_offset = 0x100000;
+	size_t bmp_size, bmp_header_size = sizeof(struct bmp_header);
+
+	if (bmp_load_addr + bmp_header_size >= gd->start_addr_sp)
+		goto splash_address_too_high;
+
+	res = nand_read_skip_bad(&nand_info[nand_curr_device],
+			splash_screen_nand_offset, &bmp_header_size,
+			(u_char *)bmp_load_addr);
+	if (res < 0)
+		return res;
+
+	bmp_hdr = (struct bmp_header *)bmp_load_addr;
+	bmp_size = le32_to_cpu(bmp_hdr->file_size);
+
+	if (bmp_load_addr + bmp_size >= gd->start_addr_sp)
+		goto splash_address_too_high;
+
+	return nand_read_skip_bad(&nand_info[nand_curr_device],
+			splash_screen_nand_offset, &bmp_size,
+			(u_char *)bmp_load_addr);
+
+splash_address_too_high:
+	printf("Error: splashimage address too high. Data overwrites U-Boot "
+		"and/or placed beyond DRAM boundaries.\n");
+
+	return -1;
+}
+#else
+static inline int splash_load_from_nand(void)
+{
+	return -1;
+}
+#endif /* CONFIG_CMD_NAND */
+
+int board_splash_screen_prepare(void)
+{
+	char *env_splashimage_value;
+	u32 bmp_load_addr;
+
+	env_splashimage_value = getenv("splashimage");
+	if (env_splashimage_value == NULL)
+		return -1;
+
+	bmp_load_addr = simple_strtoul(env_splashimage_value, 0, 16);
+	if (bmp_load_addr == 0) {
+		printf("Error: bad splashimage address specified\n");
+		return -1;
+	}
+
+	/* Fix bmp_load_addr to the alignment that lcd.c expects */
+	if (bmp_load_addr % 4 != 2)
+		bmp_load_addr += (bmp_load_addr % 4) ?: 2;
+
+	return splash_load_from_nand(bmp_load_addr);
+}
+#endif /* CONFIG_LCD */
+
 /*
  * Routine: board_init
  * Description: hardware init.
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 46d35ba..53c4e3c 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -344,5 +344,9 @@ 
 #define LCD_BPP		LCD_COLOR16
 
 #define CONFIG_LCD
+#define CONFIG_SPLASH_SCREEN
+#define CONFIG_CMD_BMP
+#define CONFIG_BMP_16BPP
+#define CONFIG_SPLASH_SCREEN_PREPARE
 
 #endif /* __CONFIG_H */