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/cpu/mcf532x | |
| parent | 34e4a2ec0ad95cea910094e33761bddf56ad7fc0 (diff) | |
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/cpu/mcf532x')
| -rw-r--r-- | arch/m68k/cpu/mcf532x/cpu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index db7ded4782..8d01f5fcf0 100644 --- a/arch/m68k/cpu/mcf532x/cpu_init.c +++ b/arch/m68k/cpu/mcf532x/cpu_init.c @@ -208,10 +208,10 @@ void cpu_init_f(void) scm2_t *scm2 = (scm2_t *) MMAP_SCM2; gpio_t *gpio = (gpio_t *) MMAP_GPIO; fbcs_t *fbcs = (fbcs_t *) MMAP_FBCS; +#ifndef CONFIG_WATCHDOG wdog_t *wdog = (wdog_t *) MMAP_WDOG; /* watchdog is enabled by default - disable the watchdog */ -#ifndef CONFIG_WATCHDOG out_be16(&wdog->cr, 0); #endif |