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

This reverts commit bcc51c1512.

Commit bcc51c1512 ("ARM: uniphier: move lowlevel debug init code
after page table switch") was intended to support lowlevel debug for
sLD3.  Now the sLD3 SoC support has been removed.

Revert it to allow to enable lowlevel debug earlier.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
master
Masahiro Yamada 7 years ago
parent 00aa453ebf
commit 0aa8b2c3e0
  1. 8
      arch/arm/mach-uniphier/arm32/lowlevel_init.S

@ -25,6 +25,10 @@ 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
/* /*
@ -42,10 +46,6 @@ 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)

Loading…
Cancel
Save