Skip to content

Commit de867e5

Browse files
move wait_arm9 to just before jump to kernel
We don't need to spin on this so early. Make forward progress and check this value later. Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
1 parent 1507c49 commit de867e5

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

arm11/source/start.S

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,15 @@ _start:
5353
@ Clear exclusive records
5454
clrex
5555

56-
@ Wait until ARM9 tells Linux address...
5756
ldr r0, =SYNC_ADDR
5857
mov r1, #0
5958
str r1, [r0]
6059
str r1, [r0, #4]
6160
str r1, [r0, #8]
6261
str r1, [r0, #12]
63-
wait_arm9:
64-
ldr r1, [r0]
65-
cmp r1, #0
66-
beq wait_arm9
67-
68-
ldr r0, =SCU_BASE_ADDR
6962

7063
@ Disable SCU
64+
ldr r0, =SCU_BASE_ADDR
7165
ldr r1, [r0, #SCU_CTRL_REG]
7266
bic r1, r1, #SCU_CTRL_ENABLE
7367
str r1, [r0, #SCU_CTRL_REG]
@@ -134,6 +128,13 @@ wait_arm9:
134128

135129
@@@@@ Jump to the kernel @@@@@
136130

131+
@ Wait until ARM9 tells Linux address...
132+
ldr r0, =SYNC_ADDR
133+
wait_arm9:
134+
ldr r1, [r0]
135+
cmp r1, #0
136+
beq wait_arm9
137+
137138
@ Setup the registers before
138139
@ jumping to the kernel entry
139140
mov r0, #0

0 commit comments

Comments
 (0)