Fixes for gcc 3.4 based m68k toolchain,

based on patch by Jate Sujjavanich.

diff --git a/CHANGELOG b/CHANGELOG
index 7483fa605c460c93d9a0c761519ba9ff79915ae6..c637d010603566cc8e5489113ab9046652082606 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fixes for gcc 3.4 based m68k toolchain,
+  based on patch by Jate Sujjavanich.
+
 * Added support for BC3450 board
   Patch by Stefan Strobl, 21. Oct 2005
 

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 73cc2f2c10c1e563ef5e458e070b2a01f9ac895b..82452e2c4811108b43ee94e99c1db4b1546b42c2 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -65,6 +65,7 @@ void flash_print_info (flash_info_t * info)
        printf ("\n");
 
 Done:
+       return;
 }
 
 

diff --git a/board/m5272c3/flash.c b/board/m5272c3/flash.c
index f156342291a832490ac59639a4d0aec5a3b68569..ea0b1fd7e0942a126cae6585a208b10bbb32b82d 100644 (file)
--- a/board/m5272c3/flash.c
+++ b/board/m5272c3/flash.c
@@ -65,6 +65,7 @@ void flash_print_info (flash_info_t * info)
        printf ("\n");
 
       Done:
+       return;
 }
 
 

diff --git a/board/m5282evb/flash.c b/board/m5282evb/flash.c
index 95f35ad84f9b71a3fac76439e718785ca6b5a6c6..36a7c310f90bd03736348af21020656b86347d65 100644 (file)
--- a/board/m5282evb/flash.c
+++ b/board/m5282evb/flash.c
@@ -65,6 +65,7 @@ void flash_print_info (flash_info_t * info)
        printf ("\n");
 
       Done:
+       return;
 }
 
 

diff --git a/config.mk b/config.mk
index dfbb1b7c6f220f4f12f467e66fb76c7d979e5ae4..b1e1d8f149c5794c2f7d9d818862e7ea5affcb7e 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -143,7 +143,14 @@ CFLAGS := $(CPPFLAGS) -Wall -Wno-trigraphs
 endif
 endif
 
+# turn jbsr into jsr for m68k
+ifeq ($(ARCH),m68k)
+ifeq ($(findstring 3.4,$(shell $(CC) --version)),3.4)
+AFLAGS_DEBUG := -Wa,-gstabs,-S
+endif
+else
 AFLAGS_DEBUG := -Wa,-gstabs
+endif
 AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS)
 
 LDFLAGS += -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index e25833b32bef47308e5a605c6a6648fa303d0e79..c13268c09e24f0e006fc8e68a1821d8dce7cd254 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -261,6 +261,7 @@ board_init_f (ulong bootflag)
 {
        bd_t *bd;
        ulong len, addr, addr_sp;
+       ulong *paddr;
        gd_t *id;
        init_fnc_t **init_fnc_ptr;
 #ifdef CONFIG_PRAM
@@ -357,8 +358,12 @@ board_init_f (ulong bootflag)
         */
        addr_sp -= 16;
        addr_sp &= ~0xF;
-       *((ulong *) addr_sp)-- = 0;
-       *((ulong *) addr_sp)-- = 0;
+
+       paddr = (ulong *)addr_sp;
+       *paddr-- = 0;
+       *paddr-- = 0;
+       addr_sp = (ulong)paddr;
+       
        debug ("Stack Pointer at: %08lx\n", addr_sp);
 
        /*