Przeglądaj źródła

ARM: uniphier: move lowlevel debug init code after page table switch

As the sLD3 Boot ROM has a complex page table, it is difficult to
set up the debug UART with enabling it.  It will be much easier to
initialize the UART port after switching over to the straight-mapped
page table.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Masahiro Yamada 8 lat temu
rodzic
commit
bcc51c1512
1 zmienionych plików z 4 dodań i 4 usunięć
  1. 4 4
      arch/arm/mach-uniphier/arm32/lowlevel_init.S

+ 4 - 4
arch/arm/mach-uniphier/arm32/lowlevel_init.S

@@ -25,10 +25,6 @@ ENTRY(lowlevel_init)
 	orr	r0, r0, #(CR_C | CR_M)	@ enable MMU and Dcache
 	orr	r0, r0, #(CR_C | CR_M)	@ enable MMU and Dcache
 	mcr	p15, 0, r0, c1, c0, 0
 	mcr	p15, 0, r0, c1, c0, 0
 
 
-#ifdef CONFIG_DEBUG_LL
-	bl	debug_ll_init
-#endif
-
 	bl	setup_init_ram		@ RAM area for stack and page table
 	bl	setup_init_ram		@ RAM area for stack and page table
 
 
 	/*
 	/*
@@ -47,6 +43,10 @@ ENTRY(lowlevel_init)
 
 
 	bl	enable_mmu
 	bl	enable_mmu
 
 
+#ifdef CONFIG_DEBUG_LL
+	bl	debug_ll_init
+#endif
+
 	mov	lr, r8			@ restore link
 	mov	lr, r8			@ restore link
 	mov	pc, lr			@ back to my caller
 	mov	pc, lr			@ back to my caller
 ENDPROC(lowlevel_init)
 ENDPROC(lowlevel_init)