diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-10 18:01:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-10 18:01:22 -0400 |
| commit | 8cb3ce64f936f5dedbcfc1935c5caf31bb682474 (patch) | |
| tree | bc6cbbacd344ccdac327b4bb7337aa316ad000e0 /arch/arm/cpu | |
| parent | 4bdb49a7487d1c46c04e3da3f1f370cde1566aea (diff) | |
| parent | 9620d87259572ef21f0df60988d9a932ca673779 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm720t/start.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index 0bb3441fb8..365d8f08cb 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -38,7 +38,8 @@ reset: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ + !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) bl cpu_init_crit #endif @@ -62,7 +63,8 @@ c_runtime_cpu_setup: ************************************************************************* */ -#ifndef CONFIG_SKIP_LOWLEVEL_INIT +#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && \ + !defined(CONFIG_SKIP_LOWLEVEL_INIT_ONLY) cpu_init_crit: mov ip, lr |