Skip to content

Reduce flash page size from 512 to 32 bytes in PSOC6 based boards #9940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2019
Merged

Reduce flash page size from 512 to 32 bytes in PSOC6 based boards #9940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions targets/TARGET_Cypress/TARGET_PSOC6/flash_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,27 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
{
(void)(obj);
int32_t status = 0;
if (Cy_Flash_ProgramRow(address, (const uint32_t *)data) != CY_FLASH_DRV_SUCCESS) {
status = -1;
static uint8_t prog_buf[CY_FLASH_SIZEOF_ROW];
while (size) {
uint32_t offset = address % CY_FLASH_SIZEOF_ROW;
uint32_t chunk_size;
if (offset + size > CY_FLASH_SIZEOF_ROW) {
chunk_size = CY_FLASH_SIZEOF_ROW - offset;
} else {
chunk_size = size;
}
uint32_t row_address = address / CY_FLASH_SIZEOF_ROW * CY_FLASH_SIZEOF_ROW;
memcpy(prog_buf, (const void *)row_address, CY_FLASH_SIZEOF_ROW);
memcpy(prog_buf + offset, data, chunk_size);

if (Cy_Flash_ProgramRow(row_address, (const uint32_t *)prog_buf) != CY_FLASH_DRV_SUCCESS) {
status = -1;
}
address += chunk_size;
size -= chunk_size;
}

Cy_SysLib_ClearFlashCacheAndBuffer();
return status;
}

Expand All @@ -67,7 +84,7 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
uint32_t flash_get_page_size(const flash_t *obj)
{
(void)(obj);
return CY_FLASH_SIZEOF_ROW;
return CY_FLASH_EFFECTIVE_PAGE_SIZE;
}

uint32_t flash_get_start_address(const flash_t *obj)
Expand Down
2 changes: 2 additions & 0 deletions targets/TARGET_Cypress/TARGET_PSOC6/psoc6pdl/drivers/include/cy_flash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ extern "C" {

/** Flash row size */
#define CY_FLASH_SIZEOF_ROW (CPUSS_FLASHC_PA_SIZE * 4u)
/** Flash effective page size */
#define CY_FLASH_EFFECTIVE_PAGE_SIZE 32
/** Long words flash row size */
#define CY_FLASH_SIZEOF_ROW_LONG_UNITS (CY_FLASH_SIZEOF_ROW / sizeof(uint32_t))

Expand Down
2 changes: 2 additions & 0 deletions targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/device/drivers/peripheral/flash/cy_flash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ extern "C" {

/** Flash row size */
#define CY_FLASH_SIZEOF_ROW (CPUSS_FLASHC_PA_SIZE * 4u)
/** Flash effective page size */
#define CY_FLASH_EFFECTIVE_PAGE_SIZE 32
/** Number of flash rows */
#define CY_FLASH_NUMBER_ROWS (CY_FLASH_SIZE / CY_FLASH_SIZEOF_ROW)
/** Long words flash row size */
Expand Down
23 changes: 20 additions & 3 deletions targets/TARGET_Cypress/TARGET_PSOC6_FUTURE/flash_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,27 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
{
(void)(obj);
int32_t status = 0;
if (Cy_Flash_ProgramRow(address, (const uint32_t *)data) != CY_FLASH_DRV_SUCCESS) {
status = -1;
static uint8_t prog_buf[CY_FLASH_SIZEOF_ROW];
while (size) {
uint32_t offset = address % CY_FLASH_SIZEOF_ROW;
uint32_t chunk_size;
if (offset + size > CY_FLASH_SIZEOF_ROW) {
chunk_size = CY_FLASH_SIZEOF_ROW - offset;
} else {
chunk_size = size;
}
uint32_t row_address = address / CY_FLASH_SIZEOF_ROW * CY_FLASH_SIZEOF_ROW;
memcpy(prog_buf, (const void *)row_address, CY_FLASH_SIZEOF_ROW);
memcpy(prog_buf + offset, data, chunk_size);

if (Cy_Flash_ProgramRow(row_address, (const uint32_t *)prog_buf) != CY_FLASH_DRV_SUCCESS) {
status = -1;
}
address += chunk_size;
size -= chunk_size;
}

Cy_SysLib_ClearFlashCacheAndBuffer();
return status;
}

Expand All @@ -67,7 +84,7 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
uint32_t flash_get_page_size(const flash_t *obj)
{
(void)(obj);
return CY_FLASH_SIZEOF_ROW;
return CY_FLASH_EFFECTIVE_PAGE_SIZE;
}

uint32_t flash_get_start_address(const flash_t *obj)
Expand Down