diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-11 23:07:09 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-11 23:07:09 +0100 |
| commit | d2ed2f661b6f74b68105d27a399801bdef287ef5 (patch) | |
| tree | 73cfc86cd9b530b5660d933a824dd9c985273ef1 | |
| parent | 8de7ed3abe2b972fd3cc2eda3953fa2c0b554e3e (diff) | |
More GCC 4.x woes
| -rw-r--r-- | board/trab/Makefile | 2 | ||||
| -rw-r--r-- | cpu/arm920t/s3c24x0/usb_ohci.c | 3 | ||||
| -rw-r--r-- | lib_arm/board.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/board/trab/Makefile b/board/trab/Makefile index ced9bc5bc8..159404b269 100644 --- 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 b4cc74476b..869ca79d03 100644 --- 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 76639081ed..1028b046d8 100644 --- 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); |