altos: Use explicit boot loader signal in ao_boot_reboot

[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..bcebf033ed5b9fa78dd19e80daf240262e5ed9ee 100644 (file)
--- a/src/stm/ao_boot_chain.c
+++ b/src/stm/ao_boot_chain.c
@@ -26,9 +26,11 @@ ao_boot_chain(uint32_t *base)
 
        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
@@ -42,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 == AO_BOOT_FORCE_LOADER)
+                       return 0;
                ao_boot_chain(ao_boot.base);
        }
+       return 1;
 }
 
 void