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/arm920t/start.S | |
| 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/arm920t/start.S')
| -rw-r--r-- | arch/arm/cpu/arm920t/start.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index 69cabebed9..3ada6d026f 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -135,6 +135,7 @@ cpu_init_crit: orr r0, r0, #0x00001000 @ set bit 12 (I) I-Cache mcr p15, 0, r0, c1, c0, 0 +#ifndef CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* * before relocating, we have to setup RAM timing * because memory timing is board-dependend, you will @@ -143,7 +144,7 @@ cpu_init_crit: mov ip, lr bl lowlevel_init - mov lr, ip +#endif mov pc, lr #endif /* CONFIG_SKIP_LOWLEVEL_INIT */ |
