diff --git a/start.S b/start.S
index a800811618e87b8c010f3cd22d13d0661c7a2fe2..97d92cf1673493263b03b581f236f860d01c8b2d 100644
--- a/start.S
+++ b/start.S
@@ -37,6 +37,8 @@ _start:
 	/* preserve dtb addr */
 	mov 	x25, x0
 
+	bl	set_bootstrap_cpu
+
 	// disable mmu and cache
 	mrs	x2, sctlr_el1
 	mov	x3, #SCTLR_EL1_M_BIT|SCTLR_EL1_C_BIT
@@ -95,8 +97,6 @@ el1_entry:
 	/* Set the context id */
 	msr	contextidr_el1, xzr
 
-	bl	pick_bootstrap_cpu
-
 	ldr	x0, =lcpus
 	msr	tpidr_el1, x0