Deduplication of flash code for STM32F0 and F1.
Extension of code for STM32F1 to allow for dual bank series XL. Small changes to documentation for F2, F4 and L1 to add a parameter reference. Tested with STM32F103RBT6 (note: tests show that the PG bit must be cleared after programming, otherwise a subsequent erase attempt fails. This has been added to flash_program_half_word for F0 and F1 only. A fix for the other families is not included in this PR.)
This commit is contained in:
Ken Sarkies
committed by
Frantisek Burian
Frantisek Burian
parent
a4d9a41093
commit
0af6d06eda
@@ -44,27 +44,37 @@
|
||||
/**@{*/
|
||||
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/cm3/common.h>
|
||||
#include <libopencm3/stm32/common/flash_common_f01.h>
|
||||
|
||||
/* --- FLASH registers ----------------------------------------------------- */
|
||||
/* --- FLASH_OPTION bytes ------------------------------------------------- */
|
||||
|
||||
#define FLASH_ACR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x00)
|
||||
#define FLASH_KEYR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x04)
|
||||
#define FLASH_OPTKEYR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x08)
|
||||
#define FLASH_SR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x0C)
|
||||
#define FLASH_CR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x10)
|
||||
#define FLASH_AR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x14)
|
||||
#define FLASH_OBR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x1C)
|
||||
#define FLASH_WRPR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x20)
|
||||
/** @defgroup flash_options Option Byte Addresses
|
||||
@ingroup flash_defines
|
||||
@{*/
|
||||
#define FLASH_OPTION_BYTE_0 FLASH_OPTION_BYTE(0)
|
||||
#define FLASH_OPTION_BYTE_1 FLASH_OPTION_BYTE(1)
|
||||
#define FLASH_OPTION_BYTE_2 FLASH_OPTION_BYTE(2)
|
||||
#define FLASH_OPTION_BYTE_3 FLASH_OPTION_BYTE(3)
|
||||
#define FLASH_OPTION_BYTE_4 FLASH_OPTION_BYTE(4)
|
||||
#define FLASH_OPTION_BYTE_5 FLASH_OPTION_BYTE(5)
|
||||
#define FLASH_OPTION_BYTE_6 FLASH_OPTION_BYTE(6)
|
||||
#define FLASH_OPTION_BYTE_7 FLASH_OPTION_BYTE(7)
|
||||
/**@}*/
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Register values */
|
||||
/*****************************************************************************/
|
||||
|
||||
/* --- FLASH_ACR values ---------------------------------------------------- */
|
||||
|
||||
#define FLASH_ACR_PRFTBS (1 << 5)
|
||||
#define FLASH_ACR_PRFTBE (1 << 4)
|
||||
#define FLASH_ACR_HLFCYA (1 << 3)
|
||||
/** @defgroup flash_latency FLASH Wait States
|
||||
@ingroup flash_defines
|
||||
@{*/
|
||||
#define FLASH_ACR_LATENCY_0WS 0x00
|
||||
#define FLASH_ACR_LATENCY_1WS 0x01
|
||||
#define FLASH_ACR_LATENCY_2WS 0x02
|
||||
/**@}*/
|
||||
#define FLASH_ACR_HLFCYA (1 << 3)
|
||||
|
||||
/* --- FLASH_SR values ----------------------------------------------------- */
|
||||
|
||||
@@ -75,17 +85,6 @@
|
||||
|
||||
/* --- FLASH_CR values ----------------------------------------------------- */
|
||||
|
||||
#define FLASH_CR_EOPIE (1 << 12)
|
||||
#define FLASH_CR_ERRIE (1 << 10)
|
||||
#define FLASH_CR_OPTWRE (1 << 9)
|
||||
#define FLASH_CR_LOCK (1 << 7)
|
||||
#define FLASH_CR_STRT (1 << 6)
|
||||
#define FLASH_CR_OPTER (1 << 5)
|
||||
#define FLASH_CR_OPTPG (1 << 4)
|
||||
#define FLASH_CR_MER (1 << 2)
|
||||
#define FLASH_CR_PER (1 << 1)
|
||||
#define FLASH_CR_PG (1 << 0)
|
||||
|
||||
/* --- FLASH_OBR values ---------------------------------------------------- */
|
||||
|
||||
/* FLASH_OBR[25:18]: Data1 */
|
||||
@@ -93,40 +92,27 @@
|
||||
#define FLASH_OBR_NRST_STDBY (1 << 4)
|
||||
#define FLASH_OBR_NRST_STOP (1 << 3)
|
||||
#define FLASH_OBR_WDG_SW (1 << 2)
|
||||
#define FLASH_OBR_RDPRT (1 << 1)
|
||||
#define FLASH_OBR_OPTERR (1 << 0)
|
||||
#define FLASH_OBR_RDPRT_EN (1 << FLASH_OBR_RDPRT_SHIFT)
|
||||
|
||||
/* --- FLASH Keys -----------------------------------------------------------*/
|
||||
/*****************************************************************************/
|
||||
/* API definitions */
|
||||
/*****************************************************************************/
|
||||
|
||||
/* Read protection option byte protection enable key */
|
||||
#define FLASH_RDP_KEY ((uint16_t)0x00a5)
|
||||
#define FLASH_KEYR_KEY1 ((uint32_t)0x45670123)
|
||||
#define FLASH_KEYR_KEY2 ((uint32_t)0xcdef89ab)
|
||||
|
||||
/* --- Function prototypes ------------------------------------------------- */
|
||||
|
||||
BEGIN_DECLS
|
||||
|
||||
void flash_prefetch_buffer_enable(void);
|
||||
void flash_prefetch_buffer_disable(void);
|
||||
void flash_halfcycle_enable(void);
|
||||
void flash_halfcycle_disable(void);
|
||||
void flash_set_ws(uint32_t ws);
|
||||
void flash_unlock(void);
|
||||
void flash_lock(void);
|
||||
void flash_clear_pgerr_flag(void);
|
||||
void flash_clear_eop_flag(void);
|
||||
void flash_clear_wrprterr_flag(void);
|
||||
void flash_clear_bsy_flag(void);
|
||||
void flash_clear_status_flags(void);
|
||||
uint32_t flash_get_status_flags(void);
|
||||
void flash_unlock_option_bytes(void);
|
||||
void flash_erase_all_pages(void);
|
||||
void flash_erase_page(uint32_t page_address);
|
||||
void flash_program_word(uint32_t address, uint32_t data);
|
||||
void flash_program_half_word(uint32_t address, uint16_t data);
|
||||
void flash_wait_for_last_operation(void);
|
||||
void flash_erase_option_bytes(void);
|
||||
void flash_program_option_bytes(uint32_t address, uint16_t data);
|
||||
void flash_unlock_upper(void);
|
||||
void flash_lock_upper(void);
|
||||
void flash_clear_pgerr_flag_upper(void);
|
||||
void flash_clear_eop_flag_upper(void);
|
||||
void flash_clear_wrprterr_flag_upper(void);
|
||||
void flash_clear_bsy_flag_upper(void);
|
||||
|
||||
END_DECLS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user