Merge branch 'master' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / board / gth2 / lowlevel_init.S

diff --git a/board/gth2/lowlevel_init.S b/board/gth2/lowlevel_init.S
index eea378a3b653e344b4b0398e8777ac3c222c9050..bc31c00531204a4807281b9b28aad53a8ff8ad5f 100644 (file)
--- a/board/gth2/lowlevel_init.S
+++ b/board/gth2/lowlevel_init.S
@@ -1,13 +1,12 @@
 /* Memory sub-system initialization code */
 
 #include <config.h>
-#include <version.h>
 #include <asm/regdef.h>
 #include <asm/au1x00.h>
 #include <asm/mipsregs.h>
 
 #define CP0_Config0            $16
-#define MEM_1MS                        ((CFG_MHZ) * 1000)
+#define MEM_1MS                        ((CONFIG_SYS_MHZ) * 1000)
 #define GPIO_RJ1LY     (1<<22)
 #define GPIO_CFRESET   (1<<10)
 
@@ -450,7 +449,7 @@ mtc:        sw      zero, 0(t0)
        nop
        nop
 memtestend:
-       j       ra
+       jr      ra
        nop
 
 memhang: