mips32: add per-cpu quirks feature

[openocd.git] / src / target / mips_ejtag.c

diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c
index a1a179216d084440941c5cdcfb9c37ee6519b985..5c92bf9ee3467dc038b1e47dc25a7ecbe5a95692 100644 (file)
--- a/src/target/mips_ejtag.c
+++ b/src/target/mips_ejtag.c
@@ -259,9 +259,12 @@ int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info)
 {
        struct pa_list pracc_list = {.instr = MIPS32_DRET(ejtag_info->isa), .addr = 0};
        struct pracc_queue_info ctx = {.max_code = 1, .pracc_list = &pracc_list, .code_count = 1, .store_count = 0};
+       struct mips32_common *mips32 = container_of(ejtag_info,
+                                            struct mips32_common, ejtag_info);
 
        /* execute our dret instruction */
-       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, NULL, 0); /* shift out instr, omit last check */
+       ctx.retval = mips32_pracc_queue_exec(ejtag_info, &ctx, NULL,
+                                     mips32->cpu_quirks & EJTAG_QUIRK_PAD_DRET);
 
        /* pic32mx workaround, false pending at low core clock */
        jtag_add_sleep(1000);