diff options
| author | Evert Pap <evert.pap@sintecs.nl> | 2016-09-14 11:10:56 (GMT) |
|---|---|---|
| committer | Evert Pap <evert.pap@sintecs.nl> | 2016-09-14 11:10:56 (GMT) |
| commit | 67e39eed5d590a9d29e2cb747b5eaa79a0f11a69 (patch) | |
| tree | 40422948d7909f8306f4425adca0d838ba81976b /arch/arm/cpu/arm926ejs/start.S | |
| parent | 6d249763300432a786ee03cdbb09dd3b065c5189 (diff) | |
| parent | ab01ef5fa617444fd95543ee04ea53ccda273269 (diff) | |
| download | u-boot-fsl-qoriq-67e39eed5d590a9d29e2cb747b5eaa79a0f11a69.tar.xz | |
Merge branch 'master' into scalys
Diffstat (limited to 'arch/arm/cpu/arm926ejs/start.S')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/start.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index f05113d..959d1ed 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -101,11 +101,13 @@ flush_dcache: #endif mcr p15, 0, r0, c1, c0, 0 +#ifndef CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* * Go setup Memory and board specific bits prior to relocation. */ mov ip, lr /* perserve link reg across call */ bl lowlevel_init /* go setup pll,mux,memory */ mov lr, ip /* restore link */ +#endif mov pc, lr /* back to my caller */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ |