diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-13 09:01:14 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-20 23:05:39 +0900 |
| commit | 0aa8b2c3e07ac14da6aaef69b06ba7a688f88b99 (patch) | |
| tree | e7ae186171bd6d16a0a3258caa03662dc3881037 /arch/arm/mach-uniphier | |
| parent | 00aa453ebf56fc3a2bd5b684467bc912ba59c4d6 (diff) | |
Revert "ARM: uniphier: move lowlevel debug init code after page table switch"
This reverts commit bcc51c1512a3deb6a9fdd37362c6dde32ad3da23.
Commit bcc51c1512a3 ("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>
Diffstat (limited to 'arch/arm/mach-uniphier')
| -rw-r--r-- | arch/arm/mach-uniphier/arm32/lowlevel_init.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-uniphier/arm32/lowlevel_init.S b/arch/arm/mach-uniphier/arm32/lowlevel_init.S index 89bb5a6355..3c7c650279 100644 --- a/arch/arm/mach-uniphier/arm32/lowlevel_init.S +++ b/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 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 /* @@ -42,10 +46,6 @@ ENTRY(lowlevel_init) bl enable_mmu -#ifdef CONFIG_DEBUG_LL - bl debug_ll_init -#endif - mov lr, r8 @ restore link mov pc, lr @ back to my caller ENDPROC(lowlevel_init) |