sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove EXTENDED_RESET define

This commit is contained in:
Chuck McManis 2016-12-04 13:51:27 -08:00
parent a3c2592e44
commit 085c980215
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/cortexm.c
View File

@ -444,7 +444,7 @@ static void cortexm_reset(target *t)
CORTEXM_AIRCR_VECTKEY | CORTEXM_AIRCR_SYSRESETREQ); CORTEXM_AIRCR_VECTKEY | CORTEXM_AIRCR_SYSRESETREQ);
/* If target needs to do something extra (see Atmel SAM4L for example) */ /* If target needs to do something extra (see Atmel SAM4L for example) */
if ((t->target_options & CORTEXM_TOPT_EXTENDED_RESET) != 0) { if (t->extended_reset != NULL) {
t->extended_reset(t); t->extended_reset(t);
} }

1
src/target/cortexm.h
View File

@ -155,7 +155,6 @@
#define ARM_THUMB_BREAKPOINT 0xBE00 #define ARM_THUMB_BREAKPOINT 0xBE00
#define CORTEXM_TOPT_INHIBIT_SRST (1 << 2) #define CORTEXM_TOPT_INHIBIT_SRST (1 << 2)
#define CORTEXM_TOPT_EXTENDED_RESET (1 << 3)
bool cortexm_probe(ADIv5_AP_t *ap); bool cortexm_probe(ADIv5_AP_t *ap);
ADIv5_AP_t *cortexm_ap(target *t); ADIv5_AP_t *cortexm_ap(target *t);

7
src/target/sam4l.c
View File

@ -229,12 +229,7 @@ bool sam4l_probe(target *t)
t->idcode = target_mem_read32(t, SAM4L_CHIPID_CIDR); t->idcode = target_mem_read32(t, SAM4L_CHIPID_CIDR);
if (((t->idcode >> CHIPID_CIDR_ARCH_SHIFT) & CHIPID_CIDR_ARCH_MASK) == SAM4L_ARCH) { if (((t->idcode >> CHIPID_CIDR_ARCH_SHIFT) & CHIPID_CIDR_ARCH_MASK) == SAM4L_ARCH) {
t->driver = "Atmel SAM4L"; t->driver = "Atmel SAM4L";
#ifdef SAM4_DISABLE_SRST /* this function says we need to do "extra" stuff after reset */
/* Check to see if our extended reset will fix this */
t->target_options |= CORTEXM_TOPT_INHIBIT_SRST;
#endif
/* this option says we need to do "extra" stuff after reset */
t->target_options |= CORTEXM_TOPT_EXTENDED_RESET;
t->extended_reset = sam4l_extended_reset; t->extended_reset = sam4l_extended_reset;
ram_size = sam_ram_size(t->idcode); ram_size = sam_ram_size(t->idcode);
target_add_ram(t, 0x20000000, ram_size); target_add_ram(t, 0x20000000, ram_size);