projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm: Increase MISO DMA priority to very high
[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 9c63272b34b2261cd77cce868b93b31b0b6ce905..d91afdabc7fcbfb949ac007d72d0b8e330339fdf 100644
(file)
--- a/
src/stm/ao_boot_chain.c
+++ b/
src/stm/ao_boot_chain.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,9
+27,11
@@
ao_boot_chain(uint32_t *base)
sp = base[0];
pc = base[1];
sp = base[0];
pc = base[1];
- asm ("mov sp, %0" : : "r" (sp));
- asm ("mov lr, %0" : : "r" (pc));
- asm ("bx lr");
+ if (0x08000100 <= pc && pc <= 0x08200000 && (pc & 1) == 1) {
+ asm ("mov sp, %0" : : "r" (sp));
+ asm ("mov lr, %0" : : "r" (pc));
+ asm ("bx lr");
+ }
}
#define AO_BOOT_SIGNAL 0x5a5aa5a5
}
#define AO_BOOT_SIGNAL 0x5a5aa5a5
@@
-40,16
+43,19
@@
struct ao_boot {
uint32_t check;
};
uint32_t check;
};
-st
atic struct ao_boot __attribute__ ((section(".boot"))) ao_boot
;
-
-void
+st
ruct ao_boot ao_boot __attribute__((section(".preserve.2")))
;
+
+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