X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_interrupt.c;h=9a0591876348892e85dfddb6efcac07b8e68dc01;hb=8a24d37e40210b1fb5cdab944c3a6d9ae4e144d7;hp=9e7562193c37d1567b11ef5fd1d8ed56ad5671cf;hpb=c9c35b100c3fcae661501d2bf89eedc7fceb2e1c;p=fw%2Faltos

diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index 9e756219..9a059187 100644
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/ao_interrupt.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
@@ -18,12 +19,9 @@
 #include <ao.h>
 #include "stm32l.h"
 #include <string.h>
+#include <ao_boot.h>
 
 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__;
 
 /* Interrupt functions */
 
@@ -36,74 +34,36 @@ 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>
-
-#define AO_BOOT_APPLICATION		0x5a5aa5a5
-#define AO_BOOT_APPLICATION_CHECK	0xc3c33c3c
-
-static uint32_t	ao_boot_application;
-static uint32_t	ao_boot_application_check;
-
-static void
-ao_boot_chain(void) {
-	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");
-}
-
-void
-ao_reboot_application(void)
-{
-	ao_boot_application = AO_BOOT_APPLICATION;
-	ao_boot_application_check = AO_BOOT_APPLICATION_CHECK;
-	ao_arch_reboot();
-}
-
-#endif
-
-void start(void) {
-#ifdef AO_BOOT_APPLICATION_PIN
-	uint16_t v;
-
-	if (ao_boot_application == AO_BOOT_APPLICATION &&
-	    ao_boot_application_check == AO_BOOT_APPLICATION_CHECK) {
-		ao_boot_application = 0;
-		ao_boot_application_check = 0;
-		ao_boot_chain();
+uint32_t
+stm_flash_size(void) {
+	uint16_t	dev_id = stm_dev_id();
+	uint16_t	kbytes = 0;
+
+	switch (dev_id) {
+	case 0x416:	/* cat 1 */
+		kbytes = stm_flash_size_medium.f_size;
+		break;
+	case 0x429:	/* cat 2 */
+		kbytes = stm_flash_size_medium.f_size & 0xff;
+		break;
+	case 0x427:	/* cat 3 */
+		kbytes = stm_flash_size_large.f_size;
+		break;
+	case 0x436:	/* cat 4 */
+		switch (stm_flash_size_large.f_size) {
+		case 0:
+			kbytes = 256;
+			break;
+		case 1:
+			kbytes = 384;
+			break;
+		}
+		break;
+	case 0x437:	/* cat 5 */
+		kbytes = stm_flash_size_large.f_size;
+		break;
 	}
-	/* 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)
-		ao_boot_chain();
-#endif
-
-	/* Set interrupt vector table offset */
-	stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
-	memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
-	memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
-	main();
+	return (uint32_t) kbytes * 1024;
 }
 
 #define STRINGIFY(x) #x
@@ -173,10 +133,18 @@ isr(tim7)
 
 #define i(addr,name)	[(addr)/4] = stm_ ## name ## _isr
 
-__attribute__ ((section(".interrupt")))
-const void *stm_interrupt_vector[] = {
-	[0] = &__stack__,
-	[1] = start,
+extern char __stack[];
+void _start(void) __attribute__((__noreturn__));
+void main(void) __attribute__((__noreturn__));
+
+/* This must be exactly 256 bytes long so that the configuration data
+ * gets loaded at the right place
+ */
+
+__attribute__ ((section(".init")))
+const void * const __interrupt_vector[64] = {
+	[0] = &__stack,
+	[1] = _start,
 	i(0x08, nmi),
 	i(0x0c, hardfault),
 	i(0x10, memmanage),
@@ -232,3 +200,28 @@ const void *stm_interrupt_vector[] = {
 	i(0xec, tim6),
 	i(0xf0, tim7),
 };
+
+extern char __data_source[];
+extern char __data_start[];
+extern char __data_size[];
+extern char __bss_start[];
+extern char __bss_size[];
+
+void _start(void) {
+	memcpy(__data_start, __data_source, (uintptr_t) __data_size);
+	memset(__bss_start, '\0', (uintptr_t) __bss_size);
+
+#ifdef AO_BOOT_CHAIN
+	if (ao_boot_check_chain()) {
+#ifdef AO_BOOT_PIN
+		if (ao_boot_check_pin())
+#endif
+		{
+			ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+		}
+	}
+#endif
+	/* Set interrupt vector table offset */
+	stm_nvic.vto = (uint32_t) &__interrupt_vector;
+	main();
+}