From 9e898cc4b8f3e1a5844a3693412a9977a65a0a63 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Thu, 18 Jul 2019 17:10:48 +0200 Subject: [PATCH] adiv5: Add more coresight part numbers found on STM32MP157c-DK2 (#492). Only print corename if not NULL. --- src/command.c | 3 ++- src/target/adiv5.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/command.c b/src/command.c index 85b77a0b..ff7bce91 100644 --- a/src/command.c +++ b/src/command.c @@ -226,7 +226,8 @@ static void display_target(int i, target *t, void *context) { (void)context; gdb_outf("%2d %c %s %s\n", i, target_attached(t)?'*':' ', - target_driver_name(t), target_core_name(t)); + target_driver_name(t), + (target_core_name(t)) ? target_core_name(t): ""); } bool cmd_targets(void) diff --git a/src/target/adiv5.c b/src/target/adiv5.c index a959f197..acf81119 100644 --- a/src/target/adiv5.c +++ b/src/target/adiv5.c @@ -195,9 +195,11 @@ static const struct { {0x941, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight TPIU-Lite", "(Trace Port Interface Unit)")}, {0x950, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight Component", "(unidentified Cortex-A9 component)")}, {0x955, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight Component", "(unidentified Cortex-A5 component)")}, + {0x956, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("Cortex-A7 ETM", "(Embedded Trace)")}, {0x95f, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("Cortex-A15 PTM", "(Program Trace Macrocell)")}, {0x961, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight TMC", "(Trace Memory Controller)")}, {0x962, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight STM", "(System Trace Macrocell)")}, + {0x963, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight STM", "(System Trace Macrocell)")}, {0x975, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("Cortex-M7 ETM", "(Embedded Trace)")}, {0x9a0, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("CoreSight PMU", "(Performance Monitoring Unit)")}, {0x9a1, aa_nosupport, cidc_unknown, PIDR_PN_BIT_STRINGS("Cortex-M4 TPIU", "(Trace Port Interface Unit)")},