X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fcortex_m.c;h=854e8eb586adb300819490b4734c020f30d4bc64;hb=fb52ba4fa1ea4f5bcf4b72ac85af4fe2fada7ee7;hp=014ceaebaa00b163dd9ea68525afc8d9319eca0a;hpb=8bbbff185ff97102f7b0db4f1aee7f4d81a06e7d;p=openocd.git

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 014ceaebaa..854e8eb586 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -1959,7 +1959,8 @@ static int cortex_m_set_watchpoint(struct target *target, struct watchpoint *wat
 	target_write_u32(target, comparator->dwt_comparator_address + 0,
 		comparator->comp);
 
-	if ((cortex_m->dwt_devarch & 0x1FFFFF) != DWT_DEVARCH_ARMV8M) {
+	if ((cortex_m->dwt_devarch & 0x1FFFFF) != DWT_DEVARCH_ARMV8M_V2_0
+			&& (cortex_m->dwt_devarch & 0x1FFFFF) != DWT_DEVARCH_ARMV8M_V2_1) {
 		uint32_t mask = 0, temp;
 
 		/* watchpoint params were validated earlier */