From 3b326e4b9942f90ee0cde8ccae1aef3fa9856fbf Mon Sep 17 00:00:00 2001 From: Jacques Comeaux Date: Sat, 23 Dec 2023 22:31:58 -0600 Subject: Use bx instruction for returns --- clocks.s | 2 +- gpio.s | 2 +- pll.s | 2 +- xosc.s | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clocks.s b/clocks.s index 09a0f6d..74bd215 100644 --- a/clocks.s +++ b/clocks.s @@ -15,4 +15,4 @@ setup_clocks: str r0, [r1, CLK_REF_CTRL_OFST] movs r0, 1 // use auxsrc (default pll_sys, =0x1) as clk_sys source str r0, [r1, CLK_SYS_CTRL_OFST] - mov pc, lr + bx lr diff --git a/gpio.s b/gpio.s index 3b98ba0..1ef296c 100644 --- a/gpio.s +++ b/gpio.s @@ -22,4 +22,4 @@ setup_gpio: tst r0, r2 // IO_BANK0 is still bit 5 // wait for reset done beq 1b - mov pc, lr + bx lr diff --git a/pll.s b/pll.s index 68a03cc..7458f61 100644 --- a/pll.s +++ b/pll.s @@ -55,4 +55,4 @@ vco_lock: ldr r1, =(PLL_SYS_BASE + ATOMIC_CLEAR) movs r0, 0x8 // postdiv (bit 3) str r0, [r1, PWR_OFST] - mov pc, lr + bx lr diff --git a/xosc.s b/xosc.s index ee58ec0..acfc577 100644 --- a/xosc.s +++ b/xosc.s @@ -20,4 +20,4 @@ start_xosc: ldr r0, [r1, STATUS_OFST] lsrs r0, r0, 31 // poll status bit beq 1b - mov pc, lr + bx lr -- cgit v1.2.3