[U-Boot] [PATCH 1/4] ARM: prevent compiler warnings from bootm.c
Albert ARIBAUD
albert.u.boot at aribaud.net
Sat Oct 11 12:52:22 CEST 2014
Hi Eric,
On Tue, 30 Sep 2014 15:40:01 -0700, Eric Nelson
<eric.nelson at 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 at 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 at aribaud.net>
Amicalement,
--
Albert.
More information about the U-Boot
mailing list