RainerWieland/EEE4STM32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD u5

Browse Source
This commit is contained in:
Nima Askari (نیما عسکری) 2023-07-11 08:48:02 +02:00 committed by GitHub
parent f80c62be93
commit e50ea125c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
ee.c
View File

@ -186,6 +186,22 @@
#endif #endif
#endif #endif
// 2MB version
#if defined(STM32U575xx) || defined(STM32U585xx)
#define _EE_SIZE 8192
#define _EE_ADDR_INUSE (((uint32_t)0x08000000) | (_EE_SIZE * _EE_USE_FLASH_PAGE_OR_SECTOR))
#define _EE_ICACHE_CTRL 1
#if (_EE_USE_FLASH_PAGE_OR_SECTOR < 128)
#define _EE_FLASH_BANK FLASH_BANK_1
#else
#define _EE_FLASH_BANK FLASH_BANK_2
#define _EE_PAGE_OR_SECTOR PAGE_NUM
#if (_EE_USE_FLASH_PAGE_OR_SECTOR > 256)
#error "Please Enter correct address, maximum is (255)"
#endif
#endif
#endif
#if (_EE_USE_RAM_BYTE > 0) #if (_EE_USE_RAM_BYTE > 0)
uint8_t ee_ram[_EE_USE_RAM_BYTE]; uint8_t ee_ram[_EE_USE_RAM_BYTE];
#endif #endif
@ -204,6 +220,9 @@ bool ee_format(bool keepRamData)
{ {
uint32_t error; uint32_t error;
HAL_FLASH_Unlock(); HAL_FLASH_Unlock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Disable();
#endif
FLASH_EraseInitTypeDef flashErase; FLASH_EraseInitTypeDef flashErase;
#if _EE_PAGE_OR_SECTOR == PAGE #if _EE_PAGE_OR_SECTOR == PAGE
flashErase.NbPages = 1; flashErase.NbPages = 1;
@ -228,17 +247,28 @@ bool ee_format(bool keepRamData)
{ {
HAL_FLASH_Lock(); HAL_FLASH_Lock();
if (error != 0xFFFFFFFF) if (error != 0xFFFFFFFF)
{
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return false; return false;
}
else else
{ {
#if (_EE_USE_RAM_BYTE > 0) #if (_EE_USE_RAM_BYTE > 0)
if (keepRamData == false) if (keepRamData == false)
memset(ee_ram, 0xFF, _EE_USE_RAM_BYTE); memset(ee_ram, 0xFF, _EE_USE_RAM_BYTE);
#endif
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif #endif
return true; return true;
} }
} }
HAL_FLASH_Lock(); HAL_FLASH_Lock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return false; return false;
} }
//########################################################################################################## //##########################################################################################################
@ -268,12 +298,18 @@ bool ee_write(uint32_t startVirtualAddress, uint32_t len, uint8_t *data)
if (data == NULL) if (data == NULL)
return false; return false;
HAL_FLASH_Unlock(); HAL_FLASH_Unlock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Disable();
#endif
#ifdef FLASH_TYPEPROGRAM_BYTE #ifdef FLASH_TYPEPROGRAM_BYTE
for (uint32_t i = 0; i < len ; i++) for (uint32_t i = 0; i < len ; i++)
{ {
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_BYTE, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, (uint64_t)(data[i])) != HAL_OK) if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_BYTE, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, (uint64_t)(data[i])) != HAL_OK)
{ {
HAL_FLASH_Lock(); HAL_FLASH_Lock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return false; return false;
} }
} }
@ -284,6 +320,9 @@ bool ee_write(uint32_t startVirtualAddress, uint32_t len, uint8_t *data)
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, (uint64_t)(data[i] | (data[i+1] << 8))) != HAL_OK) if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, (uint64_t)(data[i] | (data[i+1] << 8))) != HAL_OK)
{ {
HAL_FLASH_Lock(); HAL_FLASH_Lock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return false; return false;
} }
} }
@ -291,22 +330,45 @@ bool ee_write(uint32_t startVirtualAddress, uint32_t len, uint8_t *data)
#ifdef FLASH_TYPEPROGRAM_DOUBLEWORD #ifdef FLASH_TYPEPROGRAM_DOUBLEWORD
for (uint32_t i = 0; i < len; i += 8) for (uint32_t i = 0; i < len; i += 8)
{ {
uint64_t data64 = data[i]; uint8_t DoubleWord[8] =
data64 += data[i + 1] * 0x100; {
data64 += data[i + 2] * 0x10000; data[i + 0], data[i + 1], data[i + 2], data[i + 3], data[i + 4],\
data64 += data[i + 3] * 0x1000000; data[i + 5], data[i + 6], data[i + 7]
data64 += data[i + 4] * 0x100000000; };
data64 += data[i + 5] * 0x10000000000; if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, (uint32_t)DoubleWord) != HAL_OK)
data64 += data[i + 6] * 0x1000000000000;
data64 += data[i + 7] * 0x100000000000000;
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, data64) != HAL_OK)
{ {
HAL_FLASH_Lock(); HAL_FLASH_Lock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return false;
}
}
#endif
#ifdef FLASH_TYPEPROGRAM_QUADWORD
for (uint32_t i = 0; i < len; i += 16)
{
uint8_t QuadWord[16] =
{
data[i + 0], data[i + 1], data[i + 2], data[i + 3], data[i + 4],\
data[i + 5], data[i + 6], data[i + 7], data[i + 8], data[i + 9],\
data[i + 10], data[i + 11], data[i + 12], data[i + 13], data[i + 14],\
data[i + 15]
};
if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_QUADWORD, ((i + startVirtualAddress)) + _EE_ADDR_INUSE, (uint32_t)QuadWord) != HAL_OK)
{
HAL_FLASH_Lock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return false; return false;
} }
} }
#endif #endif
HAL_FLASH_Lock(); HAL_FLASH_Lock();
#if _EE_ICACHE_CTRL == 1
HAL_ICACHE_Enable();
#endif
return true; return true;
} }
//########################################################################################################## //##########################################################################################################

7
ee.h
View File

@ -5,9 +5,12 @@
Author: Nima Askari Author: Nima Askari
WebSite: http://www.github.com/NimaLTD WebSite: http://www.github.com/NimaLTD
Instagram: http://instagram.com/github.NimaLTD Instagram: http://instagram.com/github.NimaLTD
Youtube: https://www.youtube.com/channel/UCUhY7qY1klJm1d2kulr9ckw Youtube: https://www.youtube.com/@NimaLTD
Version: 2.0.4 Version: 2.0.5
(2.0.5)
Add U575, U585.
(2.0.4) (2.0.4)
Add G030, G050, G070. Add G030, G050, G070.