diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-02-13 17:10:58 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-04-02 06:41:56 -0400 |
| commit | ad9073211ca9e62162a39851e082b8d07a662fb6 (patch) | |
| tree | ba4c415b936854441c8860f720d20858d3387021 /cpu/blackfin/start.S | |
| parent | 84a9dda324c3faa56be14449d7519b993d9397a9 (diff) | |
| download | blackbird-obmc-uboot-ad9073211ca9e62162a39851e082b8d07a662fb6.tar.gz blackbird-obmc-uboot-ad9073211ca9e62162a39851e082b8d07a662fb6.zip | |
Blackfin: fix crash when booting from external memory
When testing a u-boot binary that hasn't been booted from the bootrom, we
have to make sure the bootstruct structure has sane storage space. If we
don't, the initcode will crash when it tries to dereference an invalid
pointer.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'cpu/blackfin/start.S')
| -rw-r--r-- | cpu/blackfin/start.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/blackfin/start.S b/cpu/blackfin/start.S index 506fea58cc..7cbd632205 100644 --- a/cpu/blackfin/start.S +++ b/cpu/blackfin/start.S @@ -131,6 +131,7 @@ ENTRY(_start) r3.h = 0x2000; cc = r5 < r3 (iu); if cc jump .Ldma_and_reprogram; + r0 = 0 (x); /* set bootstruct to NULL */ call _initcode; jump .Lprogrammed; @@ -147,6 +148,7 @@ ENTRY(_start) r1 = r1 + r5; /* ... to current (not load) address of initcode */ p3 = r0; call _dma_memcpy_nocache; + r0 = 0 (x); /* set bootstruct to NULL */ call (p3); /* Since we reprogrammed SCLK, we need to update the serial divisor */ |
