More GCC 4.x woes

diff --git a/board/trab/Makefile b/board/trab/Makefile
index ced9bc5bc8fd5fe02009536225ad04181392ed3d..159404b269aa63c57ae38e659144abdd63de310a 100644 (file)
--- a/board/trab/Makefile
+++ b/board/trab/Makefile
@@ -47,7 +47,7 @@ trab_fkt.srec:        trab_fkt.o rs485.o tsc2000.o $(LIB)
        $(OBJCOPY) -O srec $(<:.o=) $@
 
 trab_fkt.bin:  trab_fkt.srec
-       $(OBJCOPY) -O binary $< $@ 2>/dev/null
+       $(OBJCOPY) -I srec -O binary $< $@
 
 clean:
        rm -f $(SOBJS) $(OBJS)

diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/cpu/arm920t/s3c24x0/usb_ohci.c
index b4cc74476b0e4999ebd06b828bfc537e0b933621..869ca79d032dcbf97e6561836306d483662d0f2e 100644 (file)
--- a/cpu/arm920t/s3c24x0/usb_ohci.c
+++ b/cpu/arm920t/s3c24x0/usb_ohci.c
@@ -1647,7 +1647,8 @@ int usb_lowlevel_init(void)
        }
 
        /* FIXME this is a second HC reset; why?? */
-       writel (gohci.hc_control = OHCI_USB_RESET, &gohci.regs->control);
+       gohci.hc_control = OHCI_USB_RESET;
+       writel (gohci.hc_control, &gohci.regs->control);
        wait_ms (10);
 
        if (hc_start (&gohci) < 0) {

diff --git a/lib_arm/board.c b/lib_arm/board.c
index 76639081ed2804e8e31606ad017a57a20c9cc104..1028b046d8463842549711bac0ba782b97af3473 100644 (file)
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -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);