X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Flpc%2Fao_interrupt.c;h=3318db2bd14ea71ed768991c07fa8eaf01291fca;hp=b5e67007f0919458480f378438a6a70810583b97;hb=ca338a897ba3237652a3ae092e660f26c9e35074;hpb=27e9b93f3d35890a49575b2ead1983ce3c2fc213

diff --git a/src/lpc/ao_interrupt.c b/src/lpc/ao_interrupt.c
index b5e67007..3318db2b 100644
--- a/src/lpc/ao_interrupt.c
+++ b/src/lpc/ao_interrupt.c
@@ -17,12 +17,25 @@
 
 #include <ao.h>
 #include <string.h>
+#include <ao_boot.h>
+
+#ifndef IS_FLASH_LOADER
+#error Should define IS_FLASH_LOADER
+#define IS_FLASH_LOADER	0
+#endif
+
+#if !IS_FLASH_LOADER
+#define RELOCATE_INTERRUPT	1
+#endif
 
 extern void main(void);
 extern char __stack__;
 extern char __text_start__, __text_end__;
 extern char __data_start__, __data_end__;
 extern char __bss_start__, __bss_end__;
+#if RELOCATE_INTERRUPT
+extern char __interrupt_rom__, __interrupt_start__, __interrupt_end__;
+#endif
 
 /* Interrupt functions */
 
@@ -35,10 +48,18 @@ void lpc_ignore_isr(void)
 {
 }
 
-int x;
-
 void start(void) {
-	x = 0;
+#ifdef AO_BOOT_CHAIN
+	if (ao_boot_check_chain()) {
+#ifdef AO_BOOT_PIN
+		ao_boot_check_pin();
+#endif
+	}
+#endif
+#if RELOCATE_INTERRUPT
+	memcpy(&__interrupt_start__, &__interrupt_rom__, &__interrupt_end__ - &__interrupt_start__);
+	lpc_scb.sysmemremap = LPC_SCB_SYSMEMREMAP_MAP_RAM << LPC_SCB_SYSMEMREMAP_MAP;
+#endif
 	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
 	memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
 	main();
@@ -151,5 +172,5 @@ const void *lpc_interrupt_vector[] = {
 	i(0xb0, hardfault),	/* IRQ28 */
 	i(0xb4, hardfault),
 	i(0xb8, usb_wakeup),
-	i(0xbc, hardfault),	
+	i(0xbc, hardfault),
 };