Merge branch 'telegps-v3'

diff --git a/configure.ac b/configure.ac
index 6c7f0f1cfd4f4ccc33d5b621d995aa56a47f5ddf..0faa934af4aea743a81f740d4c0f7905e857f11f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,13 +18,13 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.9.15)
+AC_INIT([altos], 1.9.15.1)
 ANDROID_VERSION=36
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2023-02-19
+RELEASE_DATE=2023-04-25
 AC_SUBST(RELEASE_DATE)
 
 DOC_DATE=`LC_ALL=C date -d $RELEASE_DATE +'%d %b %Y'`

diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h
index 47ac72787aa1801bbd3f56dc891efa0c8402ce44..1450545a10c015d9d33fd2c75f95d5f68eb57f07 100644 (file)
--- a/src/stmf0/ao_arch.h
+++ b/src/stmf0/ao_arch.h
@@ -41,9 +41,11 @@
 #define __interrupt(n)
 #define __at(n)
 
-#define ao_arch_reboot() \
-       (stm_scb.aircr = ((STM_SCB_AIRCR_VECTKEY_KEY << STM_SCB_AIRCR_VECTKEY) | \
-                         (1 << STM_SCB_AIRCR_SYSRESETREQ)))
+static inline void ao_arch_reboot(void) {
+       stm_flash.cr = (1 << STM_FLASH_CR_OBL_LAUNCH);
+       stm_scb.aircr = ((STM_SCB_AIRCR_VECTKEY_KEY << STM_SCB_AIRCR_VECTKEY) |
+                        (1 << STM_SCB_AIRCR_SYSRESETREQ));
+}
 
 #define ao_arch_nop()          asm("nop")
 

diff --git a/src/stmf0/stm32f0.h b/src/stmf0/stm32f0.h
index 1735900c771a8ecaf29b6e88f23fd6bb8cdb40d0..0e0267432dcf10213c2fafa18b8584b70a041102 100644 (file)
--- a/src/stmf0/stm32f0.h
+++ b/src/stmf0/stm32f0.h
@@ -212,18 +212,6 @@ extern struct stm_flash    stm_flash;
 #define  STM_FLASH_ACR_LATENCY_0               0
 #define  STM_FLASH_ACR_LATENCY_1               1
 
-#define STM_FLASH_PECR_OBL_LAUNCH      18
-#define STM_FLASH_PECR_ERRIE           17
-#define STM_FLASH_PECR_EOPIE           16
-#define STM_FLASH_PECR_FPRG            10
-#define STM_FLASH_PECR_ERASE           9
-#define STM_FLASH_PECR_FTDW            8
-#define STM_FLASH_PECR_DATA            4
-#define STM_FLASH_PECR_PROG            3
-#define STM_FLASH_PECR_OPTLOCK         2
-#define STM_FLASH_PECR_PRGLOCK         1
-#define STM_FLASH_PECR_PELOCK          0
-
 #define STM_FLASH_SR_EOP               5
 #define STM_FLASH_SR_WRPRTERR          4
 #define STM_FLASH_SR_PGERR             2