[PATCH 1/2] uimage: fix: always support multi image support

[PATCH 1/2] uimage: fix: always support multi image support

[Jean-Christophe PLAGNIOL-VILLARD]

drop ifdef CONFIG_UIMAGE_MULTI as the Kconfig option is not present anyway

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/uimage.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/common/uimage.c b/common/uimage.c
index 1ac0b7d..ed93a4b 100644
--- a/common/uimage.c
+++ b/common/uimage.c
@@ -29,17 +29,10 @@
 #include <filetype.h>
 #include <memory.h>
 
-#ifdef CONFIG_UIMAGE_MULTI
 static inline int uimage_is_multi_image(struct uimage_handle *handle)
 {
 	return (handle->header.ih_type == IH_TYPE_MULTI) ? 1 : 0;
 }
-#else
-static inline int uimage_is_multi_image(struct uimage_handle *handle)
-{
-	return 0;
-}
-#endif
 
 void uimage_print_contents(struct uimage_handle *handle)
 {
-- 
1.8.4.rc1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] uimage: fix: fill size when no compression is used

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 common/uimage.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/uimage.c b/common/uimage.c
index ed93a4b..f6b6990 100644
--- a/common/uimage.c
+++ b/common/uimage.c
@@ -478,6 +478,7 @@ void *uimage_load_to_buf(struct uimage_handle *handle, int image_no,
 			free(buf);
 			return NULL;
 		}
+		size = ihd->len;
 		goto out;
 	}
 
-- 
1.8.4.rc1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/2] uimage: fix: always support multi image support

[Sascha Hauer]

On Mon, Aug 12, 2013 at 12:09:22PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> drop ifdef CONFIG_UIMAGE_MULTI as the Kconfig option is not present anyway
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied both

Thanks
 Sascha


> ---
>  common/uimage.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/common/uimage.c b/common/uimage.c
> index 1ac0b7d..ed93a4b 100644
> --- a/common/uimage.c
> +++ b/common/uimage.c
> @@ -29,17 +29,10 @@
>  #include <filetype.h>
>  #include <memory.h>
>  
> -#ifdef CONFIG_UIMAGE_MULTI
>  static inline int uimage_is_multi_image(struct uimage_handle *handle)
>  {
>  	return (handle->header.ih_type == IH_TYPE_MULTI) ? 1 : 0;
>  }
> -#else
> -static inline int uimage_is_multi_image(struct uimage_handle *handle)
> -{
> -	return 0;
> -}
> -#endif
>  
>  void uimage_print_contents(struct uimage_handle *handle)
>  {
> -- 
> 1.8.4.rc1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox