Re: [U-Boot] [PATCH v5 2/2] splash: add support for loading splash from a FIT image

[Anatolij Gustschin]

On Fri, 13 Jan 2017 13:20:14 +0200
Tomas Melin tomas.me...@vaisala.com wrote:

> Enable support for loading a splash image from within a FIT image.
> The image is assumed to be generated with mkimage -E flag to hold
> the data external to the FIT.
> 
> Signed-off-by: Tomas Melin 
> ---
> 
> Changes in v5:
> - Change two debug() statements to use printf(), update printed error msg 
> 
> Changes in v4:
> - Added missing changelog
> 
> Changes in v3:
> - Add documentation to README.splashprepare
> - Change printf() to debug()
> - Coding style fixes
> 
> Changes in v2:
> - Add helper functions to image-fit.c for getting required FIT data fields
> - Add comments
> 
>  common/image-fit.c   | 48 
>  common/splash_source.c   | 72 
> +++-
>  doc/README.splashprepare | 15 ++
>  include/image.h  |  4 +++
>  include/splash.h |  5 ++--
>  5 files changed, 136 insertions(+), 8 deletions(-)

applied to u-boot-video/master. Thanks!

--
Anatolij
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v5 2/2] splash: add support for loading splash from a FIT image

[Igor Grinberg]

On 01/13/17 13:20, Tomas Melin wrote:
> Enable support for loading a splash image from within a FIT image.
> The image is assumed to be generated with mkimage -E flag to hold
> the data external to the FIT.
> 
> Signed-off-by: Tomas Melin 

Acked-by: Igor Grinberg 

-- 
Regards,
Igor.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v5 2/2] splash: add support for loading splash from a FIT image

[Tomas Melin]

Enable support for loading a splash image from within a FIT image.
The image is assumed to be generated with mkimage -E flag to hold
the data external to the FIT.

Signed-off-by: Tomas Melin 
---

Changes in v5:
- Change two debug() statements to use printf(), update printed error msg 

Changes in v4:
- Added missing changelog

Changes in v3:
- Add documentation to README.splashprepare
- Change printf() to debug()
- Coding style fixes

Changes in v2:
- Add helper functions to image-fit.c for getting required FIT data fields
- Add comments

 common/image-fit.c   | 48 
 common/splash_source.c   | 72 +++-
 doc/README.splashprepare | 15 ++
 include/image.h  |  4 +++
 include/splash.h |  5 ++--
 5 files changed, 136 insertions(+), 8 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index 77dc011..2bc536c 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -777,6 +777,54 @@ int fit_image_get_data(const void *fit, int noffset,
 }
 
 /**
+ * Get 'data-offset' property from a given image node.
+ *
+ * @fit: pointer to the FIT image header
+ * @noffset: component image node offset
+ * @data_offset: holds the data-offset property
+ *
+ * returns:
+ * 0, on success
+ * -ENOENT if the property could not be found
+ */
+int fit_image_get_data_offset(const void *fit, int noffset, int *data_offset)
+{
+   const fdt32_t *val;
+
+   val = fdt_getprop(fit, noffset, FIT_DATA_OFFSET_PROP, NULL);
+   if (!val)
+   return -ENOENT;
+
+   *data_offset = fdt32_to_cpu(*val);
+
+   return 0;
+}
+
+/**
+ * Get 'data-size' property from a given image node.
+ *
+ * @fit: pointer to the FIT image header
+ * @noffset: component image node offset
+ * @data_size: holds the data-size property
+ *
+ * returns:
+ * 0, on success
+ * -ENOENT if the property could not be found
+ */
+int fit_image_get_data_size(const void *fit, int noffset, int *data_size)
+{
+   const fdt32_t *val;
+
+   val = fdt_getprop(fit, noffset, FIT_DATA_SIZE_PROP, NULL);
+   if (!val)
+   return -ENOENT;
+
+   *data_size = fdt32_to_cpu(*val);
+
+   return 0;
+}
+
+/**
  * fit_image_hash_get_algo - get hash algorithm name
  * @fit: pointer to the FIT format image header
  * @noffset: hash node offset
diff --git a/common/splash_source.c b/common/splash_source.c
index 5f6e961..4c64f10 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -296,6 +297,72 @@ static struct splash_location *select_splash_location(
return NULL;
 }
 
+#ifdef CONFIG_FIT
+static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
+{
+   int res;
+   int node_offset;
+   int splash_offset;
+   int splash_size;
+   struct image_header *img_header;
+   const u32 *fit_header;
+   u32 fit_size;
+   const size_t header_size = sizeof(struct image_header);
+
+   /* Read in image header */
+   res = splash_storage_read_raw(location, bmp_load_addr, header_size);
+   if (res < 0)
+   return res;
+
+   img_header = (struct image_header *)bmp_load_addr;
+   fit_size = fdt_totalsize(img_header);
+
+   /* Read in entire FIT */
+   fit_header = (const u32 *)(bmp_load_addr + header_size);
+   res = splash_storage_read_raw(location, (u32)fit_header, fit_size);
+   if (res < 0)
+   return res;
+
+   res = fit_check_format(fit_header);
+   if (!res) {
+   debug("Could not find valid FIT image\n");
+   return -EINVAL;
+   }
+
+   node_offset = fit_image_get_node(fit_header, location->name);
+   if (node_offset < 0) {
+   debug("Could not find splash image '%s' in FIT\n",
+ location->name);
+   return -ENOENT;
+   }
+
+   res = fit_image_get_data_offset(fit_header, node_offset,
+   _offset);
+   if (res < 0) {
+   printf("Failed to load splash image (err=%d)\n", res);
+   return res;
+   }
+
+   res = fit_image_get_data_size(fit_header, node_offset, _size);
+   if (res < 0) {
+   printf("Failed to load splash image (err=%d)\n", res);
+   return res;
+   }
+
+   /* Align data offset to 4-byte boundrary */
+   fit_size = fdt_totalsize(fit_header);
+   fit_size = (fit_size + 3) & ~3;
+
+   /* Read in the splash data */
+   location->offset = (location->offset + fit_size + splash_offset);
+   res = splash_storage_read_raw(location, bmp_load_addr , splash_size);
+   if (res < 0)
+   return res;
+
+   return 0;
+}
+#endif /* CONFIG_FIT */
+
 /**
  * splash_source_load - load splash image from a supported location.
  *
@@ -332,6