This is an automated email from Gerrit. Andrey Smirnov ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2027
-- gerrit commit 896e7fec65d9d7a311366d332aca9ae2e3841ec0 Author: Andrey Smirnov <[email protected]> Date: Mon Feb 10 08:06:04 2014 -0800 at91smad: Fixes to 'samd_protect' Some fixes to 'samd_protect' including: - Fix a bug in which the value of 'set' parameter passed into the function was ignored so it was impossible to remove flash protection once it was set. - Check the protection status of the sector via 'is_protected' field of the corresponding 'flash_sector' structure to see if any actual HW manipulations needs to be done. - Change the way the errors during protection activation are handled. Now even in the case of error in the middle of protecting a number of sectors the subroutine would still update the state of the sector protection in sectors array so as to avoid cases where openocd thinks that the sector is not protected while it actually is. Change-Id: I4cc6445a98ec13bdd94c89f0711c17840738a215 Signed-off-by: Andrey Smirnov <[email protected]> diff --git a/src/flash/nor/at91samd.c b/src/flash/nor/at91samd.c index 883e53a..a53d7f5 100644 --- a/src/flash/nor/at91samd.c +++ b/src/flash/nor/at91samd.c @@ -254,24 +254,33 @@ static int samd_protect(struct flash_bank *bank, int set, int first, int last) int res; struct samd_info *chip = (struct samd_info *)bank->driver_priv; + res = ERROR_OK; + for (int s = first; s <= last; s++) { - /* Load an address that is within this sector (we use offset 0) */ - res = target_write_u32(bank->target, SAMD_NVMCTRL + SAMD_NVMCTRL_ADDR, - s * chip->sector_size); - if (res != ERROR_OK) - return res; + if (set != bank->sectors[s].is_protected) { + /* Load an address that is within this sector (we use offset 0) */ + res = target_write_u32(bank->target, SAMD_NVMCTRL + SAMD_NVMCTRL_ADDR, + s * chip->sector_size); + if (res != ERROR_OK) + goto exit; - /* Tell the controller to lock that sector */ - res = target_write_u16(bank->target, - SAMD_NVMCTRL + SAMD_NVMCTRL_CTRLA, - SAMD_NVM_CMD(SAMD_NVM_CMD_LR)); - if (res != ERROR_OK) - return res; - } + /* Tell the controller to lock that sector */ + + uint16_t cmd = (set) ? + SAMD_NVM_CMD(SAMD_NVM_CMD_LR) : + SAMD_NVM_CMD(SAMD_NVM_CMD_UR); + res = target_write_u16(bank->target, + SAMD_NVMCTRL + SAMD_NVMCTRL_CTRLA, + cmd); + if (res != ERROR_OK) + goto exit; + } + } +exit: samd_protect_check(bank); - return ERROR_OK; + return res; } static bool samd_check_error(struct flash_bank *bank) -- ------------------------------------------------------------------------------ Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce. With Perforce, you get hassle-free workflows. Merge that actually works. Faster operations. Version large binaries. Built-in WAN optimization and the freedom to use Git, Perforce or both. Make the move to Perforce. http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
