mirror of https://github.com/ARMmbed/mbed-os.git
Rebase: 0d1c6c2d34
This commit completely rewrote flash_api.c in a few places so kicked out changes from Master and accepted the branch changes. F429 + F439 : changes after code review GetSector has been rewrittenpull/4485/head
adustm
Kevin Gilbert
parent
565c3c11ad
commit
64e902edda
|
|
@ -22,57 +22,158 @@
|
|||
|
||||
#if DEVICE_FLASH
|
||||
|
||||
// This is a flash algo binary blob. It is PIC (position independent code) that should be stored in RAM
|
||||
static uint32_t FLASH_ALGO[] = {
|
||||
0xf3c04601, 0x28203007, 0x2204bf24, 0x1050eb02, 0x2810d205, 0x2203bf26, 0x1010eb02, 0xf4110880,
|
||||
0xbf181f80, 0x0010f040, 0x48714770, 0x6001496f, 0x60014970, 0x68014870, 0x01f0f041, 0x486f6001,
|
||||
0xf0106800, 0xd1080f20, 0xf245486d, 0x60015155, 0x60412106, 0x71fff640, 0x20006081, 0x49694770,
|
||||
0xf4206808, 0x600a52f8, 0x48676008, 0xf0416801, 0x60014100, 0x47702000, 0xc18cf8df, 0x0000f8dc,
|
||||
0x0004f040, 0x0000f8cc, 0x0000f8dc, 0x4000f440, 0x0000f8cc, 0x0000f8dc, 0x3080f440, 0x0000f8cc,
|
||||
0x0004f1ac, 0xf4116801, 0xbf1c3f80, 0x21aaf64a, 0xd0044a53, 0x68036011, 0x3f80f413, 0xf8dcd1fa,
|
||||
0xf0200000, 0xf8cc0004, 0xf8dc0000, 0xf4200000, 0xf8cc4000, 0x20000000, 0xf3c04770, 0x29203107,
|
||||
0x2204bf24, 0x1151eb02, 0x2910d205, 0x2203bf26, 0x1111eb02, 0xf4100889, 0xbf181f80, 0x0110f041,
|
||||
0x6802483d, 0x02f0f042, 0xf1006002, 0x22020c04, 0x2000f8cc, 0x2000f8dc, 0xea0323f8, 0x431101c1,
|
||||
0x1000f8cc, 0x1000f8dc, 0x3180f441, 0x1000f8cc, 0xf4116801, 0xbf1c3f80, 0x21aaf64a, 0xd0044a30,
|
||||
0x68036011, 0x3f80f413, 0xf8dcd1fa, 0xf0211000, 0xf8cc0102, 0x68011000, 0x0ff0f011, 0x2000bf04,
|
||||
0x68014770, 0x01f0f041, 0x20016001, 0x4b224770, 0x1cc9b430, 0xc000f8d3, 0x0103f031, 0x0cf0f04c,
|
||||
0xc000f8c3, 0x0404f103, 0x0c00f04f, 0xc000f8c4, 0xf240bf18, 0xd0252501, 0xc000f8d4, 0x0c05ea4c,
|
||||
0xc000f8c4, 0xc000f8d2, 0xc000f8c0, 0xc000f8d3, 0x3f80f41c, 0xf8d4d1fa, 0xf02cc000, 0xf8c40c01,
|
||||
0xf8d3c000, 0xf01cc000, 0xd0060ff0, 0xf0406818, 0x601800f0, 0x2001bc30, 0x1d004770, 0xf1021f09,
|
||||
0xd1d90204, 0x2000bc30, 0x00004770, 0x45670123, 0x40023c04, 0xcdef89ab, 0x40023c0c, 0x40023c14,
|
||||
0x40003000, 0x40023c00, 0x40023c10, 0x00000000
|
||||
};
|
||||
#if defined (STM32F429xx) || defined (STM32F439xx)
|
||||
#define FLASH_SIZE (uint32_t) 0x200000
|
||||
#endif
|
||||
|
||||
static const flash_algo_t flash_algo_config = {
|
||||
.init = 0x2b,
|
||||
.uninit = 0x5f,
|
||||
.erase_sector = 0xdb,
|
||||
.program_page = 0x16f,
|
||||
.static_base = 0x20c,
|
||||
.algo_blob = FLASH_ALGO
|
||||
};
|
||||
static uint32_t GetSector(uint32_t Address);
|
||||
static uint32_t GetSectorSize(uint32_t Sector);
|
||||
|
||||
static const sector_info_t sectors_info[] = {
|
||||
{0x8000000, 0x4000},
|
||||
{0x8010000, 0x10000},
|
||||
{0x8020000, 0x20000},
|
||||
{0x8100000, 0x4000},
|
||||
{0x8110000, 0x10000},
|
||||
{0x8120000, 0x20000},
|
||||
};
|
||||
|
||||
static const flash_target_config_t flash_target_config = {
|
||||
.page_size = 0x400,
|
||||
.flash_start = 0x8000000,
|
||||
.flash_size = 0x200000,
|
||||
.sectors = sectors_info,
|
||||
.sector_info_count = sizeof(sectors_info) / sizeof(sector_info_t)
|
||||
};
|
||||
|
||||
void flash_set_target_config(flash_t *obj)
|
||||
int32_t flash_init(flash_t *obj)
|
||||
{
|
||||
obj->flash_algo = &flash_algo_config;
|
||||
obj->target_config = &flash_target_config;
|
||||
/* Allow Access to Flash control registers and user Falsh */
|
||||
if (HAL_FLASH_Unlock()) {
|
||||
return -1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
int32_t flash_free(flash_t *obj)
|
||||
{
|
||||
/* Disable the Flash option control register access (recommended to protect
|
||||
the option Bytes against possible unwanted operations) */
|
||||
if (HAL_FLASH_Lock()) {
|
||||
return -1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
int32_t flash_erase_sector(flash_t *obj, uint32_t address)
|
||||
{
|
||||
/*Variable used for Erase procedure*/
|
||||
static FLASH_EraseInitTypeDef EraseInitStruct;
|
||||
uint32_t FirstSector;
|
||||
uint32_t SectorError = 0;
|
||||
|
||||
if ((address >= (FLASH_BASE + FLASH_SIZE)) || (address < FLASH_BASE)) {
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Get the 1st sector to erase */
|
||||
FirstSector = GetSector(address);
|
||||
|
||||
/* Fill EraseInit structure*/
|
||||
EraseInitStruct.TypeErase = FLASH_TYPEERASE_SECTORS;
|
||||
EraseInitStruct.VoltageRange = FLASH_VOLTAGE_RANGE_3;
|
||||
EraseInitStruct.Sector = FirstSector;
|
||||
EraseInitStruct.NbSectors = 1;
|
||||
if(HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK){
|
||||
return -1;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data, uint32_t size)
|
||||
{
|
||||
|
||||
if ((address >= (FLASH_BASE + FLASH_SIZE)) || (address < FLASH_BASE)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Note: If an erase operation in Flash memory also concerns data in the data or instruction cache,
|
||||
you have to make sure that these data are rewritten before they are accessed during code
|
||||
execution. If this cannot be done safely, it is recommended to flush the caches by setting the
|
||||
DCRST and ICRST bits in the FLASH_CR register. */
|
||||
__HAL_FLASH_DATA_CACHE_DISABLE();
|
||||
__HAL_FLASH_INSTRUCTION_CACHE_DISABLE();
|
||||
|
||||
__HAL_FLASH_DATA_CACHE_RESET();
|
||||
__HAL_FLASH_INSTRUCTION_CACHE_RESET();
|
||||
|
||||
__HAL_FLASH_INSTRUCTION_CACHE_ENABLE();
|
||||
__HAL_FLASH_DATA_CACHE_ENABLE();
|
||||
|
||||
while (size > 0) {
|
||||
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_BYTE, address, (uint64_t)*data) != HAL_OK) {
|
||||
return -1;
|
||||
} else {
|
||||
size--;
|
||||
address++;
|
||||
data++;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
|
||||
{
|
||||
|
||||
if ((address >= (FLASH_BASE + FLASH_SIZE)) || (address < FLASH_BASE)) {
|
||||
return MBED_FLASH_INVALID_SIZE;
|
||||
}
|
||||
|
||||
return (GetSectorSize(GetSector(address)));
|
||||
}
|
||||
|
||||
uint32_t flash_get_page_size(const flash_t *obj)
|
||||
{
|
||||
// not applicable for STM32F4
|
||||
return (0x4000); // minimum sector size
|
||||
}
|
||||
uint32_t flash_get_start_address(const flash_t *obj)
|
||||
{
|
||||
return FLASH_BASE;
|
||||
}
|
||||
uint32_t flash_get_size(const flash_t *obj)
|
||||
{
|
||||
return FLASH_SIZE;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Gets the sector of a given address
|
||||
* @param None
|
||||
* @retval The sector of a given address
|
||||
*/
|
||||
static uint32_t GetSector(uint32_t address)
|
||||
{
|
||||
uint32_t sector = 0;
|
||||
uint32_t tmp = address - ADDR_FLASH_SECTOR_0;
|
||||
if (address & 0x100000) { // handle 2nd bank
|
||||
sector = FLASH_SECTOR_12;
|
||||
tmp = address - ADDR_FLASH_SECTOR_12;
|
||||
}
|
||||
if (address < ADDR_FLASH_SECTOR_4) { // 16k sectorsize
|
||||
//printf("tmp for sectors less than 4: 0X%4x")
|
||||
sector += tmp >>14;
|
||||
} else if (address < ADDR_FLASH_SECTOR_5) { //64k sector size
|
||||
sector += FLASH_SECTOR_4;
|
||||
} else {
|
||||
sector += 4 + (tmp >>17);
|
||||
}
|
||||
printf("address:0X%04x%04x, secteur: %d\n", (address>>16)&0XFFFF, (address&0XFFFF), sector);
|
||||
return sector;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Gets sector Size
|
||||
* @param None
|
||||
* @retval The size of a given sector
|
||||
*/
|
||||
static uint32_t GetSectorSize(uint32_t Sector)
|
||||
{
|
||||
uint32_t sectorsize = 0x00;
|
||||
if((Sector == FLASH_SECTOR_0) || (Sector == FLASH_SECTOR_1) || (Sector == FLASH_SECTOR_2) ||\
|
||||
(Sector == FLASH_SECTOR_3) || (Sector == FLASH_SECTOR_12) || (Sector == FLASH_SECTOR_13) ||\
|
||||
(Sector == FLASH_SECTOR_14) || (Sector == FLASH_SECTOR_15)) {
|
||||
sectorsize = 16 * 1024;
|
||||
} else if((Sector == FLASH_SECTOR_4) || (Sector == FLASH_SECTOR_16)){
|
||||
sectorsize = 64 * 1024;
|
||||
} else {
|
||||
sectorsize = 128 * 1024;
|
||||
}
|
||||
return sectorsize;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue