interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: fix broken commit 

fixes commit 04fe2ca554

Change-Id: Id7fcb82fa1a445f1df21b8d98e945f7c0e08ec93
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/375
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2012-01-12 22:00:09 +00:00
parent aa29f083a7
commit c2c4f440af
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/nor/stm32f2x.c
View File

@ -595,7 +595,7 @@ static int stm32x_get_device_id(struct flash_bank *bank, uint32_t *device_id)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
if ((*device_id & DEV_ID_MASK) == 0x411) { if ((*device_id & 0xfff) == 0x411) {
/* read CPUID reg to check core type */ /* read CPUID reg to check core type */
retval = target_read_u32(target, 0xE000ED00, &cpuid); retval = target_read_u32(target, 0xE000ED00, &cpuid);
if (retval != ERROR_OK) if (retval != ERROR_OK)
@ -603,7 +603,7 @@ static int stm32x_get_device_id(struct flash_bank *bank, uint32_t *device_id)
/* check for cortex_m4 */ /* check for cortex_m4 */
if (((cpuid >> 4) & 0xFFF) == 0xC24) { if (((cpuid >> 4) & 0xFFF) == 0xC24) {
*device_id &= ~((0xFFFF << 16) | DEV_ID_MASK); *device_id &= ~((0xFFFF << 16) | 0xfff);
*device_id |= (0x1000 << 16) | 0x413; *device_id |= (0x1000 << 16) | 0x413;
LOG_INFO("stm32f4x errata detected - fixing incorrect MCU_IDCODE"); LOG_INFO("stm32f4x errata detected - fixing incorrect MCU_IDCODE");
} }