projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up stmf0 adc init.
[fw/altos]
/
src
/
stm
/
ao_boot_chain.c
diff --git
a/src/stm/ao_boot_chain.c
b/src/stm/ao_boot_chain.c
index 668f6e6d6813aab8d0b6a8afc3190dcc91f7878a..bcebf033ed5b9fa78dd19e80daf240262e5ed9ee 100644
(file)
--- 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];
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");
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;
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;
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 == AO_BOOT_FORCE_LOADER)
+ return 0;
ao_boot_chain(ao_boot.base);
}
ao_boot_chain(ao_boot.base);
}
+ return 1;
}
void
}
void