On 2/5/21 8:12 PM, Pali Rohár wrote:
Function lowlevel_init() is called only from cpu_init_crit() and this
function is wrapped into #if .. #endif section. So compile also
lowlevel_init() function under same #if condition.

Signed-off-by: Pali Rohár <p...@kernel.org>
---
  arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/omap3/lowlevel_init.S 
b/arch/arm/mach-omap2/omap3/lowlevel_init.S
index 2a05b5e521..4fa89418a1 100644
--- a/arch/arm/mach-omap2/omap3/lowlevel_init.S
+++ b/arch/arm/mach-omap2/omap3/lowlevel_init.S
@@ -45,7 +45,7 @@ ENDPROC(do_omap3_emu_romcode_call)
  ENTRY(cpy_clk_code)
        /* Copy DPLL code into SRAM */
        adr     r0, go_to_speed         /* copy from start of go_to_speed... */
-       adr     r2, lowlevel_init       /* ... up to start of low_level_init */
+       adr     r2, go_to_speed_end     /* ... up to start of go_to_speed_end */
  next2:
        ldmia   r0!, {r3 - r10}         /* copy from source address [r0] */
        stmia   r1!, {r3 - r10}         /* copy to   target address [r1] */
@@ -167,8 +167,11 @@ pll_div_add5:
  pll_div_val5:
        .word CLSEL1_EMU_VAL
+go_to_speed_end:
  #endif

This hunk above seems like an unrelated change ^ ?

+#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \
+       !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY)
  ENTRY(lowlevel_init)
        ldr     sp, SRAM_STACK
        str     ip, [sp]        /* stash ip register */
@@ -187,6 +190,7 @@ ENTRY(lowlevel_init)
        b       s_init
ENDPROC(lowlevel_init)
+#endif
/* the literal pools origin */
        .ltorg


[...]

Reply via email to