Skip to content
Snippets Groups Projects
Commit 8d196e52 authored by Eric Nelson's avatar Eric Nelson Committed by Stefano Babic
Browse files

ARM: prevent compiler warnings from bootm.c


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: default avatarEric Nelson <eric.nelson@boundarydevices.com>
Acked-by: default avatarAlbert ARIBAUD <albert.u.boot@aribaud.net>
parent c43fd23c
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include <asm/bootm.h> #include <asm/bootm.h>
#include <asm/secure.h> #include <asm/secure.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <bootm.h>
#include <vxworks.h>
#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) #if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
#include <asm/armv7.h> #include <asm/armv7.h>
...@@ -299,7 +301,8 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) ...@@ -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 * DIFFERENCE: Instead of calling prep and go at the end
* they are called if subcommand is equal 0. * 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 */ /* No need for those on ARM */
if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE) if (flag & BOOTM_STATE_OS_BD_T || flag & BOOTM_STATE_OS_CMDLINE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment