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/arm926ejs | |
| parent | a52142855a1345c233af8bb76fb1ad4d3048e008 (diff) | |
| parent | c1631c8a04f53e694dd73bbb987b97eed5188517 (diff) | |
| download | blackbird-obmc-uboot-fd9102dafea5c6959401d0dbc5293a56d2261878.tar.gz blackbird-obmc-uboot-fd9102dafea5c6959401d0dbc5293a56d2261878.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -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 f05113da9d..959d1ed86d 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 */ |
