X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_flash_stm.c;h=a33099ab2a7ae9bd3e70638ca045a9d945e0f07c;hb=52e9443d540aa5d3f29576a0440149b1b0f9c359;hp=ef2e261909574d8d8715ac850dc615f0a35f9263;hpb=30db58ade19ec69272a8c39c2f13d7919ca491a9;p=fw%2Faltos

diff --git a/src/stmf0/ao_flash_stm.c b/src/stmf0/ao_flash_stm.c
index ef2e2619..a33099ab 100644
--- a/src/stmf0/ao_flash_stm.c
+++ b/src/stmf0/ao_flash_stm.c
@@ -19,6 +19,12 @@
 #include <ao.h>
 #include <ao_flash.h>
 
+/* Note that the HSI clock must be running for this code to work.
+ * Also, special care must be taken with the linker to ensure that the
+ * functions marked 'ramtext' land in ram and not rom. An example of that
+ * can be found in altos-loader.ld
+ */
+
 static uint8_t
 ao_flash_is_locked(void)
 {
@@ -46,7 +52,7 @@ ao_flash_lock(void)
 
 #define ao_flash_wait_bsy() do { while (stm_flash.sr & (1 << STM_FLASH_SR_BSY)); } while (0)
 
-static void __attribute__ ((section(".ramtext"),noinline))
+static void __attribute__ ((section(".sdata2.flash"), noinline))
 _ao_flash_erase_page(uint32_t *page)
 {
 	stm_flash.cr |= (1 << STM_FLASH_CR_PER);
@@ -57,7 +63,7 @@ _ao_flash_erase_page(uint32_t *page)
 
 	ao_flash_wait_bsy();
 
-	stm_flash.cr &= ~(1 << STM_FLASH_CR_PER);
+	stm_flash.cr &= ~(1UL << STM_FLASH_CR_PER);
 }
 
 static uint32_t
@@ -97,7 +103,7 @@ ao_flash_erase_page(uint32_t *page)
 	ao_arch_release_interrupts();
 }
 
-static void __attribute__ ((section(".ramtext"), noinline))
+static void __attribute__ ((section(".sdata2.flash"), noinline))
 _ao_flash_page(uint16_t *dst, uint16_t *src)
 {
 	uint8_t		i;
@@ -109,7 +115,7 @@ _ao_flash_page(uint16_t *dst, uint16_t *src)
 		ao_flash_wait_bsy();
 	}
 
-	stm_flash.cr &= ~(1 << STM_FLASH_CR_PG);
+	stm_flash.cr &= ~(1UL << STM_FLASH_CR_PG);
 }
 
 void