stm32f3: flash_common_f24 now includes f3 support. Also, renamed to f234.
- Makefiles of other stm32s updated accordingly. - f3/rcc.c updated to some definition changes. - f3/flash.c removed in order to use flash_common_f234.c to comply with new organization.
This commit is contained in:
Federico Ruiz Ugalde
committed by
Piotr Esden-Tempski
Piotr Esden-Tempski
parent
74a313625f
commit
efe08e4898
@@ -40,15 +40,27 @@
|
||||
#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)
|
||||
#if !defined(STM32F3)
|
||||
#define FLASH_OPTCR MMIO32(FLASH_MEM_INTERFACE_BASE + 0x14)
|
||||
#else
|
||||
#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)
|
||||
#endif
|
||||
|
||||
/* --- FLASH_ACR values ---------------------------------------------------- */
|
||||
|
||||
#if !defined(STM32F3)
|
||||
#define FLASH_ACR_DCRST (1 << 12)
|
||||
#define FLASH_ACR_ICRST (1 << 11)
|
||||
#define FLASH_ACR_DCE (1 << 10)
|
||||
#define FLASH_ACR_ICE (1 << 9)
|
||||
#define FLASH_ACR_PRFTEN (1 << 8)
|
||||
#define FLASH_ACR_PRFTEN (1 << 8)
|
||||
#else
|
||||
#define FLASH_ACR_PRFTBS (1 << 5)
|
||||
#define FLASH_ACR_PRFTBE (1 << 4)
|
||||
#define FLASH_ACR_HLFCYA (1 << 3)
|
||||
#endif
|
||||
#define FLASH_ACR_LATENCY_0WS 0x00
|
||||
#define FLASH_ACR_LATENCY_1WS 0x01
|
||||
#define FLASH_ACR_LATENCY_2WS 0x02
|
||||
@@ -60,6 +72,7 @@
|
||||
|
||||
/* --- FLASH_SR values ----------------------------------------------------- */
|
||||
|
||||
#if !defined(STM32F3)
|
||||
#define FLASH_SR_BSY (1 << 16)
|
||||
#define FLASH_SR_PGSERR (1 << 7)
|
||||
#define FLASH_SR_PGPERR (1 << 6)
|
||||
@@ -67,9 +80,17 @@
|
||||
#define FLASH_SR_WRPERR (1 << 4)
|
||||
#define FLASH_SR_OPERR (1 << 1)
|
||||
#define FLASH_SR_EOP (1 << 0)
|
||||
#else
|
||||
#define FLASH_SR_BSY (1 << 0)
|
||||
#define FLASH_SR_ERLYBSY (1 << 1)
|
||||
#define FLASH_SR_PGPERR (1 << 2)
|
||||
#define FLASH_SR_WRPRTERR (1 << 4)
|
||||
#define FLASH_SR_EOP (1 << 5)
|
||||
#endif
|
||||
|
||||
/* --- FLASH_CR values ----------------------------------------------------- */
|
||||
|
||||
#if !defined(STM32F3)
|
||||
#define FLASH_CR_LOCK (1 << 31)
|
||||
#define FLASH_CR_ERRIE (1 << 25)
|
||||
#define FLASH_CR_EOPIE (1 << 24)
|
||||
@@ -93,7 +114,21 @@
|
||||
#define FLASH_CR_PROGRAM_X16 (0x01 << 8)
|
||||
#define FLASH_CR_PROGRAM_X32 (0x02 << 8)
|
||||
#define FLASH_CR_PROGRAM_X64 (0x03 << 8)
|
||||
#else
|
||||
#define FLASH_CR_OBL_LAUNCH (1 << 13)
|
||||
#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)
|
||||
#endif
|
||||
|
||||
#if !defined(STM32F3)
|
||||
/* --- FLASH_OPTCR values -------------------------------------------------- */
|
||||
|
||||
/* FLASH_OPTCR[27:16]: nWRP */
|
||||
@@ -107,18 +142,35 @@
|
||||
#define FLASH_OPTCR_BOR_LEVEL_2 (0x01 << 2)
|
||||
#define FLASH_OPTCR_BOR_LEVEL_1 (0x02 << 2)
|
||||
#define FLASH_OPTCR_BOR_OFF (0x03 << 2)
|
||||
#endif
|
||||
|
||||
/* --- FLASH Keys -----------------------------------------------------------*/
|
||||
|
||||
#define FLASH_KEYR_KEY1 ((uint32_t)0x45670123)
|
||||
#define FLASH_KEYR_KEY2 ((uint32_t)0xcdef89ab)
|
||||
#if !defined(STM32F3)
|
||||
#define FLASH_OPTKEYR_KEY1 ((uint32_t)0x08192a3b)
|
||||
#define FLASH_OPTKEYR_KEY2 ((uint32_t)0x4c5d6e7f)
|
||||
#endif
|
||||
|
||||
/* --- Function prototypes ------------------------------------------------- */
|
||||
|
||||
BEGIN_DECLS
|
||||
|
||||
void flash_set_ws(uint32_t ws);
|
||||
void flash_unlock(void);
|
||||
void flash_lock(void);
|
||||
void flash_clear_pgperr_flag(void);
|
||||
void flash_clear_eop_flag(void);
|
||||
void flash_clear_bsy_flag(void);
|
||||
void flash_clear_status_flags(void);
|
||||
void flash_wait_for_last_operation(void);
|
||||
#if !defined(STM32F3)
|
||||
void flash_unlock_option_bytes(void);
|
||||
void flash_lock_option_bytes(void);
|
||||
void flash_clear_pgserr_flag(void);
|
||||
void flash_clear_wrperr_flag(void);
|
||||
void flash_clear_pgaerr_flag(void);
|
||||
void flash_dcache_enable(void);
|
||||
void flash_dcache_disable(void);
|
||||
void flash_icache_enable(void);
|
||||
@@ -127,18 +179,6 @@ void flash_prefetch_enable(void);
|
||||
void flash_prefetch_disable(void);
|
||||
void flash_dcache_reset(void);
|
||||
void flash_icache_reset(void);
|
||||
void flash_set_ws(uint32_t ws);
|
||||
void flash_unlock(void);
|
||||
void flash_lock(void);
|
||||
void flash_clear_pgserr_flag(void);
|
||||
void flash_clear_pgperr_flag(void);
|
||||
void flash_clear_pgaerr_flag(void);
|
||||
void flash_clear_eop_flag(void);
|
||||
void flash_clear_wrperr_flag(void);
|
||||
void flash_clear_bsy_flag(void);
|
||||
void flash_clear_status_flags(void);
|
||||
void flash_unlock_option_bytes(void);
|
||||
void flash_lock_option_bytes(void);
|
||||
void flash_erase_all_sectors(uint32_t program_size);
|
||||
void flash_erase_sector(uint8_t sector, uint32_t program_size);
|
||||
void flash_program_double_word(uint32_t address, uint64_t data);
|
||||
@@ -146,8 +186,8 @@ void flash_program_word(uint32_t address, uint32_t data);
|
||||
void flash_program_half_word(uint32_t address, uint16_t data);
|
||||
void flash_program_byte(uint32_t address, uint8_t data);
|
||||
void flash_program(uint32_t address, uint8_t *data, uint32_t len);
|
||||
void flash_wait_for_last_operation(void);
|
||||
void flash_program_option_bytes(uint32_t data);
|
||||
#endif
|
||||
|
||||
END_DECLS
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#define LIBOPENCM3_FLASH_H
|
||||
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/stm32/common/flash_common_f24.h>
|
||||
#include <libopencm3/stm32/common/flash_common_f234.h>
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
/*
|
||||
* This file is part of the libopencm3 project.
|
||||
*
|
||||
* Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
|
||||
* Copyright (C) 2010 Mark Butler <mbutler@physics.otago.ac.nz>
|
||||
*
|
||||
* This library is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
@@ -18,107 +15,11 @@
|
||||
* along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/*
|
||||
* For details see:
|
||||
* PM0081 Programming manual: STM32F30xxx and STM32F31xxx Flash programming
|
||||
* September 2011, Doc ID 018520 Rev 1
|
||||
* http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/PROGRAMMING_MANUAL/DM00023388.pdf
|
||||
*/
|
||||
|
||||
#ifndef LIBOPENCM3_FLASH_H
|
||||
#define LIBOPENCM3_FLASH_H
|
||||
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/cm3/common.h>
|
||||
|
||||
/* --- FLASH registers ----------------------------------------------------- */
|
||||
|
||||
#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)
|
||||
|
||||
/* --- FLASH_ACR values ---------------------------------------------------- */
|
||||
|
||||
#define FLASH_LATENCY_0WS 0x00
|
||||
#define FLASH_LATENCY_1WS 0x01
|
||||
#define FLASH_LATENCY_2WS 0x02
|
||||
#define FLASH_LATENCY_3WS 0x03
|
||||
#define FLASH_LATENCY_4WS 0x04
|
||||
#define FLASH_LATENCY_5WS 0x05
|
||||
#define FLASH_LATENCY_6WS 0x06
|
||||
#define FLASH_LATENCY_7WS 0x07
|
||||
#define FLASH_PRFTBS (1 << 5)
|
||||
#define FLASH_PRFTBE (1 << 4)
|
||||
#define FLASH_HLFCYA (1 << 3)
|
||||
|
||||
/* --- FLASH_SR values ----------------------------------------------------- */
|
||||
|
||||
#define FLASH_BSY (1 << 0)
|
||||
#define FLASH_ERLYBSY (1 << 1)
|
||||
#define FLASH_PGPERR (1 << 2)
|
||||
#define FLASH_WRPRTERR (1 << 4)
|
||||
#define FLASH_EOP (1 << 5)
|
||||
|
||||
|
||||
/* --- FLASH_CR values ----------------------------------------------------- */
|
||||
|
||||
#define FLASH_OBL_LAUNCH (1 << 13)
|
||||
#define FLASH_EOPIE (1 << 12)
|
||||
#define FLASH_ERRIE (1 << 10)
|
||||
#define FLASH_OPTWRE (1 << 9)
|
||||
#define FLASH_LOCK (1 << 7)
|
||||
#define FLASH_STRT (1 << 6)
|
||||
#define FLASH_OPTER (1 << 5)
|
||||
#define FLASH_OPTPG (1 << 4)
|
||||
#define FLASH_MER (1 << 2)
|
||||
#define FLASH_PER (1 << 1)
|
||||
#define FLASH_PG (1 << 0)
|
||||
|
||||
/* --- FLASH_OBR values ----------------------------------------------------- */
|
||||
|
||||
#define FLASH_OPTERR (1 << 0)
|
||||
#define FLASH_RDPRT1 (1 << 1)
|
||||
#define FLASH_RDPRT2 (1 << 2)
|
||||
#define FLASH_WDG_SW (1 << 8)
|
||||
#define FLASH_NRST_STOP (1 << 9)
|
||||
#define FLASH_NRST_STDBY (1 << 10)
|
||||
#define FLASH_NBOOT1 (1 << 12)
|
||||
#define FLASH_VDDA_MONITOR (1 << 13)
|
||||
#define FLASH_SRAM_PE (1 << 14)
|
||||
|
||||
/* --- FLASH Keys -----------------------------------------------------------*/
|
||||
|
||||
#define FLASH_KEY1 ((uint32_t)0x45670123)
|
||||
#define FLASH_KEY2 ((uint32_t)0xcdef89ab)
|
||||
|
||||
/* --- Function prototypes ------------------------------------------------- */
|
||||
|
||||
BEGIN_DECLS
|
||||
|
||||
void flash_set_ws(uint32_t ws);
|
||||
void flash_unlock(void);
|
||||
void flash_lock(void);
|
||||
void flash_clear_pgperr_flag(void);
|
||||
void flash_clear_eop_flag(void);
|
||||
void flash_clear_bsy_flag(void);
|
||||
void flash_clear_status_flags(void);
|
||||
|
||||
/* Functions deactivated, please read flash.c for the reasons */
|
||||
/* void flash_erase_all_pages(uint32_t program_size); */
|
||||
/* void flash_erase_page(uint32_t page, uint32_t program_size); */
|
||||
/* void flash_program_double_word(uint32_t address, uint64_t data, uint32_t program_size); */
|
||||
/* void flash_program_word(uint32_t address, uint32_t data, uint32_t program_size); */
|
||||
/* void flash_program_half_word(uint32_t address, uint16_t data, uint32_t program_size); */
|
||||
/* void flash_program_byte(uint32_t address, uint8_t data, uint32_t program_size); */
|
||||
|
||||
void flash_wait_for_last_operation(void);
|
||||
void flash_program_option_bytes(uint32_t data);
|
||||
|
||||
END_DECLS
|
||||
#include <libopencm3/stm32/common/flash_common_f234.h>
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#define LIBOPENCM3_FLASH_H
|
||||
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/stm32/common/flash_common_f24.h>
|
||||
#include <libopencm3/stm32/common/flash_common_f234.h>
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
# include <libopencm3/stm32/f1/flash.h>
|
||||
#elif defined(STM32F2)
|
||||
# include <libopencm3/stm32/f2/flash.h>
|
||||
#elif defined(STM32F3)
|
||||
# include <libopencm3/stm32/f3/flash.h>
|
||||
#elif defined(STM32F4)
|
||||
# include <libopencm3/stm32/f4/flash.h>
|
||||
#elif defined(STM32L1)
|
||||
|
||||
Reference in New Issue
Block a user