diff options
| author | Simon Glass <sjg@chromium.org> | 2014-06-07 22:07:58 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-11 16:27:05 -0400 |
| commit | ddc94378db9fe0c9076512768b3576e0fdc580dd (patch) | |
| tree | 8b88de08afadcdcc7f723940ce1f2a8c2291860a /arch/m68k/lib | |
| parent | 34e4a2ec0ad95cea910094e33761bddf56ad7fc0 (diff) | |
| download | u-boot-imx-ddc94378db9fe0c9076512768b3576e0fdc580dd.zip u-boot-imx-ddc94378db9fe0c9076512768b3576e0fdc580dd.tar.gz u-boot-imx-ddc94378db9fe0c9076512768b3576e0fdc580dd.tar.bz2 | |
m68k: Fix warnings with gcc 4.6
Most of the warnings seem to be related to using 'int' for size_t. Change
this and fix up the remaining warnings and problems. For bootm, the warning
was masked by others, and there is an actual bug in the code.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/m68k/lib')
| -rw-r--r-- | arch/m68k/lib/bootm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index 804e01d..fa9c493 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -50,11 +50,7 @@ void arch_lmb_reserve(struct lmb *lmb) int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *images) { - ulong rd_len; - ulong initrd_start, initrd_end; int ret; - - ulong cmd_start, cmd_end; bd_t *kbd; void (*kernel) (bd_t *, ulong, ulong, ulong, ulong); struct lmb *lmb = &images->lmb; @@ -96,7 +92,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima * sp+16: Start of command line string * sp+20: End of command line string */ - (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end); + (*kernel)(kbd, images->initrd_start, images->initrd_end, + images->cmdline_start, images->cmdline_end); /* does not return */ error: return 1; |