[U-Boot] [PATCH 4/4] bootm: allow people to disable this command

[Wolfgang Denk]

Dear Mike Frysinger,

In message <1257371196-11360-4-git-send-email-vapier at gentoo.org> you wrote:
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>
> ---
>  common/cmd_bootm.c |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
> index ce174d7..ab636c0 100644
> --- a/common/cmd_bootm.c
> +++ b/common/cmd_bootm.c
> @@ -57,6 +57,10 @@
>  #include <lzma/LzmaTools.h>
>  #endif /* CONFIG_LZMA */
>  
> +ulong load_addr = CONFIG_SYS_LOAD_ADDR;	/* Default Load Address */
> +
> +#ifndef CONFIG_SYS_NO_BOOTM
> +
>  DECLARE_GLOBAL_DATA_PTR;
>  
>  extern int gunzip (void *dst, int dstlen, unsigned char *src, unsigned long *lenp);
> @@ -147,7 +151,6 @@ static boot_os_fn *boot_os[] = {
>  #endif
>  };
>  
> -ulong load_addr = CONFIG_SYS_LOAD_ADDR;	/* Default Load Address */
>  static bootm_headers_t images;		/* pointers to os/initrd/fdt images */
>  
>  /* Allow for arch specific config before we boot */
> @@ -1453,3 +1456,5 @@ static int do_bootm_integrity (int flag, int argc, char *argv[],
>  	return 1;
>  }
>  #endif
> +
> +#endif /* CONFIG_SYS_NO_BOOTM */

Hm... please let's not invent a new style to configure commands -
please use CONFIG_CMD_BOOTM instead (enabled by default).

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The IQ of the group is the lowest IQ of a member of the group divided
by the number of people in the group.