X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_interrupt.c;h=969e6a0f7b6a23a7433785f114c76765005509bb;hp=12763a305737623de75ad2c61757cbb9f445567e;hb=106d212ff5920c39d95751ef6249dc141970412c;hpb=a6887032b4d217bca5236ea15389218f10d69545

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index 12763a30..969e6a0f 100644
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/ao_interrupt.c
@@ -18,6 +18,7 @@
 #include <ao.h>
 #include "stm32l.h"
 #include <string.h>
+#include <ao_boot.h>
 
 extern void main(void);
 extern char __stack__;
@@ -38,43 +39,15 @@ void stm_ignore_isr(void)
 
 const void *stm_interrupt_vector[];
 
-#define BOOT_FETCH(o)	(*((uint32_t *) (AO_BOOT_APPLICATION_BASE + (o))))
-
-#ifdef AO_BOOT_APPLICATION_PIN
-#include <ao_exti.h>
+void start(void)
+{
+#ifdef AO_BOOT_CHAIN
+	if (ao_boot_check_chain()) {
+#ifdef AO_BOOT_PIN
+		ao_boot_check_pin();
 #endif
-
-void start(void) {
-#ifdef AO_BOOT_APPLICATION_PIN
-	uint16_t v;
-
-	/* Enable power interface clock */
-	stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_PWREN);
-	
-	/* Enable the input pin */
-	ao_enable_input(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN,
-			AO_BOOT_APPLICATION_MODE);
-
-	/* Read the value */
-	v = stm_gpio_get(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN);
-
-	/* Reset the chip to turn off the port and the power interface clock */
-	ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
-	ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
-	stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
-	if (v == AO_BOOT_APPLICATION_VALUE)
-	{
-		uint32_t	sp;
-		uint32_t	pc;
-
-		sp = BOOT_FETCH(0);
-		pc = BOOT_FETCH(4);
-		asm ("mov sp, %0" : : "r" (sp));
-		asm ("mov lr, %0" : : "r" (pc));
-		asm ("bx lr");
 	}
 #endif
-
 	/* Set interrupt vector table offset */
 	stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
 	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);