This is an automated email from Gerrit. Kent Brinkley ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2309
-- gerrit commit 520f648e9cb1969b29c9e14c3f8f3880c9c3f20e Author: Kent Brinkley <[email protected]> Date: Fri Sep 19 11:56:20 2014 -0700 Added clean up to fastdata load when failure is detected Change-Id: Id1587f951f52a36bac9a4c352f333b605804d9c7 Signed-off-by: Kent Brinkley <[email protected]> diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c index 49adc9d..8c3b9f0 100644 --- a/src/target/mips32_pracc.c +++ b/src/target/mips32_pracc.c @@ -1156,7 +1156,7 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are } /* If Accesses pending then attempt to cleanup any pending accesses */ - if (address != MIPS32_PRACC_TEXT) { + if (address != MIPS32_PRACC_TEXT) { LOG_ERROR("fastdata failed: checking for dangling fastdata accesses"); LOG_WARNING("increase \"scan_delay\" and retry \"load_image\" command"); @@ -1199,16 +1199,14 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are if ((pending == count) && (address == MIPS32_PRACC_TEXT)) { LOG_ERROR("\"reached max outstanding dangling accesses\" 0x%8.8" PRIx32 "", retval); return ERROR_TARGET_FAST_DOWNLOAD_FAILED; - } - else if (pending >= count) { + } else if (pending >= count) { LOG_ERROR("\"reached excessed max outstanding dangling accesses\" %d", retval); return ERROR_TARGET_FAST_DOWNLOAD_FAILED; } if (address != MIPS32_PRACC_TEXT) { - if (pending == 1){ + if (pending == 1) LOG_ERROR("found dangling fastdata accesses: starting clean-up"); - } } } while (address != MIPS32_PRACC_TEXT); @@ -1229,17 +1227,14 @@ int mips32_pracc_fastdata_xfer(struct mips_ejtag *ejtag_info, struct working_are if ((address != MIPS32_PRACC_FASTDATA_AREA) && (address != MIPS32_PRACC_TEXT)) { LOG_ERROR("unexpected dmseg access: 0x%8.8" PRIx32 "", address); return ERROR_TARGET_FAST_DOWNLOAD_FAILED; - } - else { + } else LOG_ERROR("cleared dangling fastdata accesses: found %d out-of %d pending", pending, count); - } } - if (address != MIPS32_PRACC_TEXT) { + if (address != MIPS32_PRACC_TEXT) LOG_ERROR("mini program did not return to start addr = 0x%8.8" PRIx32 "", address); - } return ERROR_TARGET_FAST_DOWNLOAD_FAILED; - } + } return retval; } -- ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that Matters. http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
