sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMV7 FLASH: Fix a cache error, fix an address comparison

Browse Source
This commit is contained in:
Gregory Nutt 2015-11-13 11:32:06 -06:00
parent a1e9a07c7a
commit ba57b5bdc0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/src/samv7/sam_progmem.c
View File

@ -486,7 +486,6 @@ size_t up_progmem_getaddress(size_t cluster)
ssize_t up_progmem_erasepage(size_t cluster)
{
uintptr_t address;
uint32_t page;
uint32_t arg;
int ret;
@ -534,12 +533,7 @@ ssize_t up_progmem_erasepage(size_t cluster)
return ret;
}
/* Invalidate I- and D-Cache in this address range */
address = SAMV7_CLUST2BYTE((uintptr_t)cluster) + SAMV7_PROGMEM_START;
arch_invalidate_dcache(address, address + SAMV7_CLUSTER_SIZE);
/* Verify */
/* Verify that the cluster of pages is really erased */
if (up_progmem_ispageerased(cluster) == 0)
{
@ -580,10 +574,10 @@ ssize_t up_progmem_ispageerased(size_t cluster)
return -EFAULT;
}
/* Invalidate D-Cache for this address range */
/* Flush and invalidate nvalidate D-Cache for this address range */
address = (cluster << SAMV7_CLUSTER_SHIFT) + SAMV7_PROGMEM_START;
arch_invalidate_dcache(address, address + SAMV7_CLUSTER_SIZE);
arch_flush_dcache(address, address + SAMV7_CLUSTER_SIZE);
/* Verify that the cluster is erased (i.e., all 0xff) */
@ -651,7 +645,7 @@ ssize_t up_progmem_write(size_t address, const void *buffer, size_t buflen)
/* Check for valid address range */
if ((offset + buflen) >= SAMV7_PROGMEM_NBYTES)
if ((offset + buflen) > SAMV7_PROGMEM_NBYTES)
{
return -EFAULT;
}