X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_boot_chain.c;h=488af1e1b8dffc2261e303aa3b3981b3a69f29f7;hp=668f6e6d6813aab8d0b6a8afc3190dcc91f7878a;hb=2f87e182d9f0b3c2856f62149371ad70b16148cf;hpb=35ef1f17e3efaa6d586ab7bb301f8133d52023b6

diff --git a/src/stm/ao_boot_chain.c b/src/stm/ao_boot_chain.c
index 668f6e6d..488af1e1 100644
--- 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
- * 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
@@ -26,7 +27,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 +45,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