X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_flash_stm.c;h=896d536ba0c1612e7fe341b4a4da0d399aa445ba;hb=44530c7439c311c573cbd4b865e7bf2c1581ab83;hp=5fe0e619fac38d9c8af3f17a634ceb238ba93ac1;hpb=df881bce8576f091b2d8cb53b8ce8a43aeedecde;p=fw%2Faltos

diff --git a/src/stmf0/ao_flash_stm.c b/src/stmf0/ao_flash_stm.c
index 5fe0e619..896d536b 100644
--- a/src/stmf0/ao_flash_stm.c
+++ b/src/stmf0/ao_flash_stm.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,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)
 {
@@ -43,14 +50,9 @@ ao_flash_lock(void)
 	stm_flash.cr |= (1 << STM_FLASH_CR_LOCK);
 }
 
-static void
-ao_flash_wait_bsy(void)
-{
-	while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
-		;
-}
+#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);
@@ -101,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;