More GCC 4.x woes

[oweals/u-boot.git] / lib_arm / board.c

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 0f3a999d140e55c46ce2b496fad268c95c1675ed..1028b046d8463842549711bac0ba782b97af3473 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -38,8 +38,6 @@
  * FIQ Stack: 00ebef7c
  */
 
-#define DEBUG 1
-
 #include <common.h>
 #include <command.h>
 #include <malloc.h>
@@ -123,7 +121,7 @@ void *sbrk (ptrdiff_t increment)
 
 static int init_baudrate (void)
 {
-       uchar tmp[64];  /* long enough for environment variables */
+       char tmp[64];   /* long enough for environment variables */
        int i = getenv_r ("baudrate", tmp, sizeof (tmp));
        gd->bd->bi_baudrate = gd->baudrate = (i > 0)
                        ? (int) simple_strtoul (tmp, NULL, 10)
@@ -237,9 +235,11 @@ init_fnc_t *init_sequence[] = {
 
 void start_armboot (void)
 {
-       ulong size;
        init_fnc_t **init_fnc_ptr;
        char *s;
+#ifndef CFG_NO_FLASH
+       ulong size;
+#endif
 #if defined(CONFIG_VFD) || defined(CONFIG_LCD)
        unsigned long addr;
 #endif
@@ -322,7 +322,7 @@ void start_armboot (void)
                int i;
                ulong reg;
                char *s, *e;
-               uchar tmp[64];
+               char tmp[64];
 
                i = getenv_r ("ethaddr", tmp, sizeof (tmp));
                s = (i > 0) ? tmp : NULL;
@@ -408,6 +408,8 @@ void hang (void)
 }
 
 #ifdef CONFIG_MODEM_SUPPORT
+static inline void mdm_readline(char *buf, int bufsiz);
+
 /* called from main loop (common/main.c) */
 extern void  dbg(const char *fmt, ...);
 int mdm_init (void)
@@ -416,7 +418,6 @@ int mdm_init (void)
        char *init_str;
        int i;
        extern char console_buffer[];
-       static inline void mdm_readline(char *buf, int bufsiz);
        extern void enable_putc(void);
        extern int hwflow_onoff(int);