X-Git-Url: https://git.gag.com/?p=fw%2Fopenocd;a=blobdiff_plain;f=src%2Ftarget%2Farm_adi_v5.c;h=65d29f0c2dc121444adea4ba6ab1500667608957;hp=9a98f61d5652bde9925fb5e726128f85123e11b5;hb=4dd8f8aa40098114d98c369933e2715b207be735;hpb=7743e0fb4390d09c315ce9c6edbb2c3ba6b8c2d9

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 9a98f61d5..65d29f0c2 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -1096,14 +1096,6 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
 
 	LOG_DEBUG(" ");
 
-	/* test for initialized low level jtag hardware
-	 * this always fails for stlink hardware
-	 */
-	if (!dap->jtag_info) {
-		LOG_DEBUG("No low level jtag hardware found");
-		return ERROR_OK;
-	}
-
 	/* JTAG-DP or SWJ-DP, in JTAG mode
 	 * ... for SWD mode this is patched as part
 	 * of link switchover
@@ -1273,6 +1265,8 @@ int dap_lookup_cs_component(struct adiv5_dap *dap, int ap,
 			retval = mem_ap_read_atomic_u32(dap,
 					(component_base & 0xfffff000) | 0xfcc,
 					&devtype);
+			if (retval != ERROR_OK)
+				return retval;
 			if ((devtype & 0xff) == type) {
 				*addr = component_base;
 				retval = ERROR_OK;
@@ -1592,6 +1586,10 @@ static int dap_info_command(struct command_context *cmd_ctx,
 					type = "Cortex-M3 FBP";
 					full = "(Flash Patch and Breakpoint)";
 					break;
+				case 0x00c:
+					type = "Cortex-M4 SCS";
+					full = "(System Control Space)";
+					break;
 				case 0x00d:
 					type = "CoreSight ETM11";
 					full = "(Embedded Trace)";
@@ -1641,10 +1639,18 @@ static int dap_info_command(struct command_context *cmd_ctx,
 					type = "Cortex-M3 ETM";
 					full = "(Embedded Trace)";
 					break;
+				case 0x925:
+					type = "Cortex-M4 ETM";
+					full = "(Embedded Trace)";
+					break;
 				case 0x930:
 					type = "Cortex-R4 ETM";
 					full = "(Embedded Trace)";
 					break;
+				case 0x9a1:
+					type = "Cortex-M4 TPUI";
+					full = "(Trace Port Interface Unit)";
+					break;
 				case 0xc08:
 					type = "Cortex-A8 Debug";
 					full = "(Debug Unit)";