public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Igor Grinberg <grinberg@compulab.co.il>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] tools/envcrc: fix compile breakage
Date: Mon, 05 Dec 2011 12:48:12 +0200	[thread overview]
Message-ID: <4EDCA16C.1080202@compulab.co.il> (raw)
In-Reply-To: <1322467058-30532-1-git-send-email-grinberg@compulab.co.il>

ping!

This fixes a compile breakage and
IMO should be applied before 2011.12 is out.
Can someone, please apply it?

On 11/28/11 09:57, Igor Grinberg wrote:
> When ENV_IS_EMBEDDED is not set, but CONFIG_BUILD_ENVCRC is set,
> the environment.h file does not get included resulting in unrecognized
> env_t type.
> Fix this by moving the include directive.
> 
> Reported-by: Mike Frysinger <vapier@gentoo.org>
> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
> ---
>  tools/envcrc.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/envcrc.c b/tools/envcrc.c
> index 111d9f6..51e3f54 100644
> --- a/tools/envcrc.c
> +++ b/tools/envcrc.c
> @@ -61,7 +61,6 @@
>  #endif	/* CONFIG_ENV_IS_IN_FLASH */
>  
>  #if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC)
> -# include <environment.h>
>  # define CONFIG_BUILD_ENVCRC 1
>  #endif
>  
> @@ -74,13 +73,14 @@
>  #define ENV_SIZE (CONFIG_ENV_SIZE - ENV_HEADER_SIZE)
>  
>  
> -extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
> -
>  #ifdef CONFIG_BUILD_ENVCRC
> +# include <environment.h>
>  extern unsigned int env_size;
>  extern env_t environment;
>  #endif	/* CONFIG_BUILD_ENVCRC */
>  
> +extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
> +
>  int main (int argc, char **argv)
>  {
>  #ifdef CONFIG_BUILD_ENVCRC

-- 
Regards,
Igor.

  parent reply	other threads:[~2011-12-05 10:48 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-07 11:13 [U-Boot] [PATCH 00/17] Cleanup environment related files Igor Grinberg
2011-11-07 11:13 ` [U-Boot] [PATCH 01/17] env: clean environment.h checkpatch and code style Igor Grinberg
2011-11-07 11:13 ` [U-Boot] [PATCH 02/17] common: move extern char console_buffer[] to common.h Igor Grinberg
2011-11-07 11:13 ` [U-Boot] [PATCH 03/17] env: move extern default_environment[] to environment.h Igor Grinberg
2011-11-07 11:17   ` Stefan Roese
2011-11-17 14:12   ` Stefano Babic
2011-11-17 15:14     ` Igor Grinberg
2011-11-17 15:30       ` Stefano Babic
2011-11-17 16:07         ` [U-Boot] [PATCH v2 04/17] env: move extern environment[] " Igor Grinberg
2011-11-25 21:12           ` Mike Frysinger
2011-11-27  8:31             ` Igor Grinberg
2011-11-28  7:57             ` [U-Boot] [PATCH] tools/envcrc: fix compile breakage Igor Grinberg
2011-11-28  8:07               ` Wolfgang Denk
2011-11-28  9:04                 ` Igor Grinberg
2011-11-28 15:15                   ` Wolfgang Denk
2011-11-29  6:38                     ` Igor Grinberg
2011-11-28 18:52                   ` Mike Frysinger
2011-11-29  6:35                     ` Igor Grinberg
2011-11-28  8:18               ` Wolfgang Denk
2011-11-28  8:53                 ` Igor Grinberg
2011-11-29  4:25               ` Mike Frysinger
2011-11-29  6:41                 ` Igor Grinberg
2011-12-05 10:48               ` Igor Grinberg [this message]
2011-12-06 21:11               ` Wolfgang Denk
2011-11-07 11:13 ` [U-Boot] [PATCH 04/17] env: move extern environment[] to environment.h Igor Grinberg
2011-11-07 11:13 ` [U-Boot] [PATCH 05/17] env: clean cmd_nvedit.c checkpatch and code style Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 06/17] env: clean env_nowhere.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 07/17] env: clean env_mgdisk.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 08/17] env: clean env_dataflash.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 09/17] env: clean env_onenand.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 10/17] env: clean env_nvram.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 11/17] env: clean env_mmc.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 12/17] env: clean env_embedded.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 13/17] env: clean env_eeprom.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 14/17] env: clean env_sf.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 15/17] env: clean env_flash.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 16/17] env: clean env_nand.c " Igor Grinberg
2011-11-07 11:14 ` [U-Boot] [PATCH 17/17] env: clean env_common.c " Igor Grinberg
2011-11-13  8:29 ` [U-Boot] [PATCH 00/17] Cleanup environment related files Igor Grinberg
2011-11-22  8:52 ` Stefano Babic

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=4EDCA16C.1080202@compulab.co.il \
    --to=grinberg@compulab.co.il \
    --cc=u-boot@lists.denx.de \
    /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