diff options
| -rw-r--r-- | board/dbau1x00/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/gth2/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/incaip/lowlevel_init.S | 8 | ||||
| -rw-r--r-- | board/pb1x00/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/purple/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | board/qemu-mips/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | cpu/mips/cache.S | 4 | ||||
| -rw-r--r-- | cpu/mips/incaip_wdt.S | 2 | ||||
| -rw-r--r-- | cpu/mips/start.S | 6 |
9 files changed, 15 insertions, 15 deletions
diff --git a/board/dbau1x00/lowlevel_init.S b/board/dbau1x00/lowlevel_init.S index 14a7846..27b51f7 100644 --- a/board/dbau1x00/lowlevel_init.S +++ b/board/dbau1x00/lowlevel_init.S @@ -586,5 +586,5 @@ noCacheJump: sw t1, 0(t0) sync - j ra + jr ra nop diff --git a/board/gth2/lowlevel_init.S b/board/gth2/lowlevel_init.S index eea378a..bf615c1 100644 --- a/board/gth2/lowlevel_init.S +++ b/board/gth2/lowlevel_init.S @@ -450,7 +450,7 @@ mtc: sw zero, 0(t0) nop nop memtestend: - j ra + jr ra nop memhang: diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S index b39f93d..08f7f21 100644 --- a/board/incaip/lowlevel_init.S +++ b/board/incaip/lowlevel_init.S @@ -105,7 +105,7 @@ __ebu_init: li t2, 0x684143FD sw t2, EBU_BUSCON1(t1) 3: - j ra + jr ra nop .end ebu_init @@ -170,7 +170,7 @@ __cgu_init: li t2, 0x80000001 sw t2, CGU_MUXCR(t1) 5: - j ra + jr ra nop .end cgu_init @@ -266,7 +266,7 @@ __sdram_init: li t2, 0x00000001 sw t2, MC_CTRLENA(t1) - j ra + jr ra nop .end sdram_init @@ -298,7 +298,7 @@ lowlevel_init: nop move ra, t0 - j ra + jr ra nop .end lowlevel_init diff --git a/board/pb1x00/lowlevel_init.S b/board/pb1x00/lowlevel_init.S index e851e2f..98bb394 100644 --- a/board/pb1x00/lowlevel_init.S +++ b/board/pb1x00/lowlevel_init.S @@ -388,5 +388,5 @@ skip_memsetup: */ sync - j ra + jr ra nop diff --git a/board/purple/lowlevel_init.S b/board/purple/lowlevel_init.S index 668124a..b9d03fc 100644 --- a/board/purple/lowlevel_init.S +++ b/board/purple/lowlevel_init.S @@ -33,5 +33,5 @@ lowlevel_init: li t0, MC_IOGP li t1, 0xf24 sw t1, 0(t0) - j ra + jr ra nop diff --git a/board/qemu-mips/lowlevel_init.S b/board/qemu-mips/lowlevel_init.S index 28166bc..836e027 100644 --- a/board/qemu-mips/lowlevel_init.S +++ b/board/qemu-mips/lowlevel_init.S @@ -37,5 +37,5 @@ lowlevel_init: mtc0 zero, CP0_WIRED nop - j ra + jr ra nop diff --git a/cpu/mips/cache.S b/cpu/mips/cache.S index 89ada71..f593968 100644 --- a/cpu/mips/cache.S +++ b/cpu/mips/cache.S @@ -282,7 +282,7 @@ LEAF(dcache_disable) and t0, t0, t1 ori t0, t0, CONF_CM_UNCACHED mtc0 t0, CP0_CONFIG - j ra + jr ra END(dcache_disable) #ifdef CFG_INIT_RAM_LOCK_MIPS @@ -308,7 +308,7 @@ mips_cache_lock: move a1, a2 icacheop(a0,a1,a2,a3,0x1d) - j ra + jr ra .end mips_cache_lock #endif /* CFG_INIT_RAM_LOCK_MIPS */ diff --git a/cpu/mips/incaip_wdt.S b/cpu/mips/incaip_wdt.S index 71adaa1..2ebcc91 100644 --- a/cpu/mips/incaip_wdt.S +++ b/cpu/mips/incaip_wdt.S @@ -68,5 +68,5 @@ disable_incaip_wdt: li t1, WD_WRITE_ENDINIT sw t1, WD_CON0(t0) /* end command */ - j ra + jr ra nop diff --git a/cpu/mips/start.S b/cpu/mips/start.S index baac2ce..6e1a78c 100644 --- a/cpu/mips/start.S +++ b/cpu/mips/start.S @@ -286,7 +286,7 @@ reset: la sp, 0(t0) la t9, board_init_f - j t9 + jr t9 nop /* @@ -342,7 +342,7 @@ relocate_code: /* Jump to where we've relocated ourselves. */ addi t0, a2, in_ram - _start - j t0 + jr t0 nop .gpword _GLOBAL_OFFSET_TABLE_ /* _GLOBAL_OFFSET_TABLE_ - _gp */ @@ -387,7 +387,7 @@ in_ram: move a0, a1 la t9, board_init_r - j t9 + jr t9 move a1, a2 /* delay slot */ .end relocate_code |