From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 11 Oct 2014 12:52:22 +0200
Subject: [U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c
In-Reply-To: <1412116804-31677-2-git-send-email-eric.nelson@boundarydevices.com>
References: <1412116804-31677-1-git-send-email-eric.nelson@boundarydevices.com>
	<1412116804-31677-2-git-send-email-eric.nelson@boundarydevices.com>
Message-ID: <E1XcuHf-0008MX-Jd@janus>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Eric,

On Tue, 30 Sep 2014 15:40:01 -0700, Eric Nelson
<eric.nelson@boundarydevices.com> wrote:

> Without preceding declarations, "make C=1" generates
> "Should it be static?" warnings for symbols
> 	do_bootm_linux,
> 	boot_prep_vxworks, and
> 	boot_jump_vxworks
> 
> Include of bootm.h also identified a signature mismatch
> (const on argv[]).
> 
> Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
> ---
>  arch/arm/lib/bootm.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 39fe7a1..4949d57 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -22,6 +22,8 @@
>  #include <asm/bootm.h>
>  #include <asm/secure.h>
>  #include <linux/compiler.h>
> +#include <bootm.h>
> +#include <vxworks.h>
>  
>  #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
>  #include <asm/armv7.h>
> @@ -299,7 +301,8 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
>   * DIFFERENCE: Instead of calling prep and go at the end
>   * they are called if subcommand is equal 0.
>   */
> -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
> +int do_bootm_linux(int flag, int argc, char * const argv[],
> +		   bootm_headers_t *images)
>  {
>  	/* No need for those on ARM */
>  	if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE)

Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>

Amicalement,
-- 
Albert.