Don't call a variable num_pages if it holds the flash size. Also rearrange
flash size to num_pages calculation to avoid divide-by-zero if there will
be a device with < 1024 byte pages someday.
Change-Id: I2febea39694a2f9750de141f52ec88ae1599c086
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/211
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
struct target *target = bank->target;
struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
int i;
struct target *target = bank->target;
struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
int i;
+ uint16_t flash_size_in_kb;
uint32_t device_id;
int page_size;
uint32_t base_address = 0x08000000;
uint32_t device_id;
int page_size;
uint32_t base_address = 0x08000000;
LOG_INFO("device id = 0x%08" PRIx32 "", device_id);
/* get flash size from target. */
LOG_INFO("device id = 0x%08" PRIx32 "", device_id);
/* get flash size from target. */
- retval = target_read_u16(target, 0x1FFFF7E0, &num_pages);
+ retval = target_read_u16(target, 0x1FFFF7E0, &flash_size_in_kb);
if (retval != ERROR_OK)
{
LOG_WARNING("failed reading flash size, default to max target family");
/* failed reading flash size, default to max target family */
if (retval != ERROR_OK)
{
LOG_WARNING("failed reading flash size, default to max target family");
/* failed reading flash size, default to max target family */
+ flash_size_in_kb = 0xffff;
}
if ((device_id & 0x7ff) == 0x410)
}
if ((device_id & 0x7ff) == 0x410)
stm32x_info->ppage_size = 4;
/* check for early silicon */
stm32x_info->ppage_size = 4;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors incorrect on revA */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
{
/* number of sectors incorrect on revA */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
+ flash_size_in_kb = 128;
}
}
else if ((device_id & 0x7ff) == 0x412)
}
}
else if ((device_id & 0x7ff) == 0x412)
stm32x_info->ppage_size = 4;
/* check for early silicon */
stm32x_info->ppage_size = 4;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors incorrect on revA */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 32k flash");
{
/* number of sectors incorrect on revA */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 32k flash");
}
}
else if ((device_id & 0x7ff) == 0x414)
}
}
else if ((device_id & 0x7ff) == 0x414)
stm32x_info->ppage_size = 2;
/* check for early silicon */
stm32x_info->ppage_size = 2;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors incorrect on revZ */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash");
{
/* number of sectors incorrect on revZ */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash");
+ flash_size_in_kb = 512;
}
}
else if ((device_id & 0x7ff) == 0x418)
}
}
else if ((device_id & 0x7ff) == 0x418)
stm32x_info->ppage_size = 2;
/* check for early silicon */
stm32x_info->ppage_size = 2;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors incorrect on revZ */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 256k flash");
{
/* number of sectors incorrect on revZ */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 256k flash");
+ flash_size_in_kb = 256;
}
}
else if ((device_id & 0x7ff) == 0x420)
}
}
else if ((device_id & 0x7ff) == 0x420)
stm32x_info->ppage_size = 4;
/* check for early silicon */
stm32x_info->ppage_size = 4;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
{
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
+ flash_size_in_kb = 128;
}
}
else if ((device_id & 0x7ff) == 0x428)
}
}
else if ((device_id & 0x7ff) == 0x428)
stm32x_info->ppage_size = 4;
/* check for early silicon */
stm32x_info->ppage_size = 4;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
{
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash");
+ flash_size_in_kb = 128;
stm32x_info->has_dual_banks = true;
/* check for early silicon */
stm32x_info->has_dual_banks = true;
/* check for early silicon */
- if (num_pages == 0xffff)
+ if (flash_size_in_kb == 0xffff)
{
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
{
/* number of sectors may be incorrrect on early silicon */
LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 1024k flash");
+ flash_size_in_kb = 1024;
}
/* split reported size into matching bank */
if (bank->base != 0x08080000)
{
/* bank 0 will be fixed 512k */
}
/* split reported size into matching bank */
if (bank->base != 0x08080000)
{
/* bank 0 will be fixed 512k */
+ flash_size_in_kb = 512;
+ flash_size_in_kb -= 512;
/* bank1 also uses a register offset */
stm32x_info->register_base = FLASH_REG_BASE_B1;
base_address = 0x08080000;
/* bank1 also uses a register offset */
stm32x_info->register_base = FLASH_REG_BASE_B1;
base_address = 0x08080000;
- LOG_INFO("flash size = %dkbytes", num_pages);
+ LOG_INFO("flash size = %dkbytes", flash_size_in_kb);
- /* did we assign # of pages? */
- assert(num_pages != 0xffff);
+ /* did we assign flash size? */
+ assert(flash_size_in_kb != 0xffff);
/* calculate numbers of pages */
/* calculate numbers of pages */
- num_pages /= (page_size / 1024);
+ int num_pages = flash_size_in_kb * 1024 / page_size;
/* check that calculation result makes sense */
assert(num_pages > 0);
/* check that calculation result makes sense */
assert(num_pages > 0);
Linking to existing account procedure
If you already have an account and want to add another login method
you
MUST first sign in with your existing account and
then change URL to read
https://review.openocd.org/login/?link
to get to this page again but this time it'll work for linking. Thank you.
SSH host keys fingerprints
1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=.. |
|+o.. . |
|*.o . . |
|+B . . . |
|Bo. = o S |
|Oo.+ + = |
|oB=.* = . o |
| =+=.+ + E |
|. .=o . o |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)