X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips32.c;h=d842705fffd1ba8561c328d9e2d2d0dbefa50275;hp=795efddf033ac158edf4b5d59d119d6b75520793;hb=02ac60b0000977c707011abeac49c58de78bb9e5;hpb=c13ca4de40d510c7d88d8ce7a43065e8f9209c65

diff --git a/src/target/mips32.c b/src/target/mips32.c
index 795efddf03..d842705fff 100644
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -536,31 +536,36 @@ int mips32_configure_break_unit(struct target *target)
 	if (retval != ERROR_OK)
 		return retval;
 
-	/* EJTAG 2.0 defines IB and DB bits in IMP instead of DCR.
-	 * Since these DCR bits should be reserved on EJTAG 2.0, we can
-	 * just remap them. */
+	/* EJTAG 2.0 defines IB and DB bits in IMP instead of DCR. */
 	if (ejtag_info->ejtag_version == EJTAG_VERSION_20) {
+		ejtag_info->debug_caps = dcr & EJTAG_DCR_ENM;
 		if (!(ejtag_info->impcode & EJTAG_V20_IMP_NOIB))
-			dcr |= EJTAG_DCR_IB;
+			ejtag_info->debug_caps |= EJTAG_DCR_IB;
 		if (!(ejtag_info->impcode & EJTAG_V20_IMP_NODB))
-			dcr |= EJTAG_DCR_DB;
-	}
+			ejtag_info->debug_caps |= EJTAG_DCR_DB;
+	} else
+		/* keep  debug caps for later use */
+		ejtag_info->debug_caps = dcr & (EJTAG_DCR_ENM
+				| EJTAG_DCR_IB | EJTAG_DCR_DB);
+
 
-	if (dcr & EJTAG_DCR_IB) {
+	if (ejtag_info->debug_caps & EJTAG_DCR_IB) {
 		retval = mips32_configure_ibs(target);
 		if (retval != ERROR_OK)
 			return retval;
 	}
 
-	if (dcr & EJTAG_DCR_DB) {
+	if (ejtag_info->debug_caps & EJTAG_DCR_DB) {
 		retval = mips32_configure_dbs(target);
 		if (retval != ERROR_OK)
 			return retval;
 	}
 
 	/* check if target endianness settings matches debug control register */
-	if (((dcr & EJTAG_DCR_ENM) && (target->endianness == TARGET_LITTLE_ENDIAN)) ||
-			(!(dcr & EJTAG_DCR_ENM) && (target->endianness == TARGET_BIG_ENDIAN)))
+	if (((ejtag_info->debug_caps & EJTAG_DCR_ENM)
+			&& (target->endianness == TARGET_LITTLE_ENDIAN)) ||
+			(!(ejtag_info->debug_caps & EJTAG_DCR_ENM)
+			 && (target->endianness == TARGET_BIG_ENDIAN)))
 		LOG_WARNING("DCR endianness settings does not match target settings");
 
 	LOG_DEBUG("DCR 0x%" PRIx32 " numinst %i numdata %i", dcr, mips32->num_inst_bpoints,