diff options
| author | Evgeniy Naydanov <109669442+en-sc@users.noreply.github.com> | 2025-04-16 18:05:14 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-16 18:05:14 +0300 |
| commit | 1aebdf8e3025e8a2ac65a1ebcdccd11448d9b46e (patch) | |
| tree | cf5134d52b04fc57bda2a7abebcd03f57d38faff /src/target/cortex_a.c | |
| parent | 2605cbd73c36998e76d32cded95a02b424870626 (diff) | |
| parent | e0236ca27323a4144e0548c556f070a80ef3a079 (diff) | |
| download | riscv-openocd-1aebdf8e3025e8a2ac65a1ebcdccd11448d9b46e.zip riscv-openocd-1aebdf8e3025e8a2ac65a1ebcdccd11448d9b46e.tar.gz riscv-openocd-1aebdf8e3025e8a2ac65a1ebcdccd11448d9b46e.tar.bz2 | |
Merge pull request #1244 from en-sc/en-sc/from_upstream
Merge up to 6834f022b96fb1c7f5829166578e01a0ac223cb0 from upstream
Diffstat (limited to 'src/target/cortex_a.c')
| -rw-r--r-- | src/target/cortex_a.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index b32fec2..9c60645 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -2923,14 +2923,12 @@ static int cortex_a_examine_first(struct target *target) armv7a->debug_ap->memaccess_tck = 80; if (!target->dbgbase_set) { - LOG_DEBUG("%s's dbgbase is not set, trying to detect using the ROM table", - target->cmd_name); + LOG_TARGET_DEBUG(target, "dbgbase is not set, trying to detect using the ROM table"); /* Lookup Processor DAP */ retval = dap_lookup_cs_component(armv7a->debug_ap, ARM_CS_C9_DEVTYPE_CORE_DEBUG, &armv7a->debug_base, target->coreid); if (retval != ERROR_OK) { - LOG_ERROR("Can't detect %s's dbgbase from the ROM table; you need to specify it explicitly.", - target->cmd_name); + LOG_TARGET_ERROR(target, "Can't detect dbgbase from the ROM table; you need to specify it explicitly"); return retval; } LOG_DEBUG("Detected core %" PRId32 " dbgbase: " TARGET_ADDR_FMT, @@ -2939,8 +2937,9 @@ static int cortex_a_examine_first(struct target *target) armv7a->debug_base = target->dbgbase; if ((armv7a->debug_base & (1UL<<31)) == 0) - LOG_WARNING("Debug base address for target %s has bit 31 set to 0. Access to debug registers will likely fail!\n" - "Please fix the target configuration.", target_name(target)); + LOG_TARGET_WARNING(target, + "Debug base address has bit 31 set to 0. Access to debug registers will likely fail!\n" + "Please fix the target configuration"); retval = mem_ap_read_atomic_u32(armv7a->debug_ap, armv7a->debug_base + CPUDBG_DIDR, &didr); |