summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorShinya Kuribayashi <skuribay@ruby.dti.ne.jp>2008-04-17 23:35:13 +0900
committerWolfgang Denk <wd@denx.de>2008-04-18 00:47:29 -0700
commit43c509254fab375c49936498da944658117ed07c (patch)
tree8b730dcbc1498dee9303af405099d32aaa3f79bb /cpu
parent7ce63709828d37b08866e537339a169bd0db2bd3 (diff)
downloadu-boot-imx-43c509254fab375c49936498da944658117ed07c.zip
u-boot-imx-43c509254fab375c49936498da944658117ed07c.tar.gz
u-boot-imx-43c509254fab375c49936498da944658117ed07c.tar.bz2
Use jr as register jump instruction
Current assembler codes are inconsistent in the way of register jump instruction usage; some use jr, some use j. Of course GNU as allows both usages, but as can be expected from `Jump Register' the mnemonic `jr' is more intuitive than `j'. For example, Linux doesn't have `j <reg>' usage at all. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mips/cache.S4
-rw-r--r--cpu/mips/incaip_wdt.S2
-rw-r--r--cpu/mips/start.S6
3 files changed, 6 insertions, 6 deletions
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