diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-13 08:50:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-13 08:50:58 -0400 |
| commit | fd9102dafea5c6959401d0dbc5293a56d2261878 (patch) | |
| tree | 5aad4472b833800daab260c94062fbaed2468d39 /arch/arm/cpu/armv7 | |
| parent | a52142855a1345c233af8bb76fb1ad4d3048e008 (diff) | |
| parent | c1631c8a04f53e694dd73bbb987b97eed5188517 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/cpu/armv7')
| -rw-r--r-- | arch/arm/cpu/armv7/start.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index b18094447b..691e5d3fe1 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -66,8 +66,10 @@ save_boot_params_ret: /* the mask ROM code should have PLL and others stable */ #ifndef CONFIG_SKIP_LOWLEVEL_INIT bl cpu_init_cp15 +#ifndef CONFIG_SKIP_LOWLEVEL_INIT_ONLY bl cpu_init_crit #endif +#endif bl _main @@ -250,7 +252,8 @@ skip_errata_621766: mov pc, r5 @ back to my caller ENDPROC(cpu_init_cp15) -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ + !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) /************************************************************************* * * CPU_init_critical registers |