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>
void
ao_boot_check_pin(void);
-void
+/* Return true to switch to application (if present) */
+int
ao_boot_check_chain(void);
void
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");
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
void start(void)
{
#ifdef AO_BOOT_CHAIN
- ao_boot_check_chain();
-#endif
+ if (ao_boot_check_chain()) {
#ifdef AO_BOOT_PIN
- ao_boot_check_pin();
+ ao_boot_check_pin();
+#endif
+ }
#endif
/* Set interrupt vector table offset */
stm_nvic.vto = (uint32_t) &stm_interrupt_vector;