Merge git://git.denx.de/u-boot-marvell

[people/ms/u-boot.git] / board / dbau1x00 / lowlevel_init.S

diff --git a/board/dbau1x00/lowlevel_init.S b/board/dbau1x00/lowlevel_init.S
index 14a78465f3659a0420bc18e42c3a5b85e2243315..409f8ee47701a3efe710cb190561deb13f95cf2c 100644 (file)
--- a/board/dbau1x00/lowlevel_init.S
+++ b/board/dbau1x00/lowlevel_init.S
@@ -1,16 +1,15 @@
 /* Memory sub-system initialization code */
 
 #include <config.h>
-#include <version.h>
+#include <mach/au1x00.h>
 #include <asm/regdef.h>
-#include <asm/au1x00.h>
 #include <asm/mipsregs.h>
 
 #define AU1500_SYS_ADDR                0xB1900000
 #define sys_endian             0x0038
 #define CP0_Config0            $16
-#define CPU_SCALE              ((CFG_MHZ) / 12) /* CPU clock is a multiple of 12 MHz */
-#define MEM_1MS                        ((CFG_MHZ) * 1000)
+#define CPU_SCALE              ((CONFIG_SYS_MHZ) / 12) /* CPU clock is a multiple of 12 MHz */
+#define MEM_1MS                        ((CONFIG_SYS_MHZ) * 1000)
 
        .text
        .set noreorder
@@ -586,5 +585,5 @@ noCacheJump:
        sw      t1, 0(t0)
        sync
 
-       j       ra
+       jr      ra
        nop