diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-27 00:20:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-05-07 21:30:26 -0700 |
| commit | 0b1797312b34ba2b8121f82605f8d2c419167737 (patch) | |
| tree | 898efa8e7754e8cb498181b9fe9e7cc47ecde49a /src/stm/ao_boot_chain.c | |
| parent | e2412e867138635d79ea0fa8d43efc0a6aa19784 (diff) | |
altos: Run self loader when application sets boot addr to 0
This causes the flash loader startup code to fall into the loader when
the application sets the boot address to zero.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/stm/ao_boot_chain.c')
| -rw-r--r-- | src/stm/ao_boot_chain.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/stm/ao_boot_chain.c b/src/stm/ao_boot_chain.c index 668f6e6d..6a3864a7 100644 --- a/src/stm/ao_boot_chain.c +++ b/src/stm/ao_boot_chain.c @@ -26,7 +26,7 @@ ao_boot_chain(uint32_t *base) sp = base[0]; pc = base[1]; - if (0x08000100 <= pc && pc <= 0x08200000) { + if (0x08000100 <= pc && pc <= 0x08200000 && (pc & 1) == 1) { asm ("mov sp, %0" : : "r" (sp)); asm ("mov lr, %0" : : "r" (pc)); asm ("bx lr"); @@ -44,14 +44,17 @@ struct ao_boot { static struct ao_boot __attribute__ ((section(".boot"))) ao_boot; -void +int ao_boot_check_chain(void) { if (ao_boot.signal == AO_BOOT_SIGNAL && ao_boot.check == AO_BOOT_CHECK) { ao_boot.signal = 0; ao_boot.check = 0; + if (ao_boot.base == 0) + return 0; ao_boot_chain(ao_boot.base); } + return 1; } void |