mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2] uimage: fix: always support multi image support
Date: Mon, 12 Aug 2013 22:04:57 +0200	[thread overview]
Message-ID: <20130812200457.GN26614@pengutronix.de> (raw)
In-Reply-To: <1376302163-32509-1-git-send-email-plagnioj@jcrosoft.com>

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

      parent reply	other threads:[~2013-08-12 20:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-12 10:09 Jean-Christophe PLAGNIOL-VILLARD
2013-08-12 10:09 ` [PATCH 2/2] uimage: fix: fill size when no compression is used Jean-Christophe PLAGNIOL-VILLARD
2013-08-12 20:04 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130812200457.GN26614@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox