This is an automated email from Gerrit. Andreas Fritiofson ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/3234
-- gerrit commit 4753329e72c281eed8cbf1bfbf5d5d500b984e14 Author: Andreas Fritiofson <[email protected]> Date: Tue Feb 9 17:50:47 2016 +0100 stm32lx: Add support for lock/unlock (RDP Level 0<->1) Change-Id: Iecc356373e084056d048d92820062483cac3c8ec Signed-off-by: Andreas Fritiofson <[email protected]> diff --git a/src/flash/nor/stm32lx.c b/src/flash/nor/stm32lx.c index 7b0b0cc..2096a0d 100644 --- a/src/flash/nor/stm32lx.c +++ b/src/flash/nor/stm32lx.c @@ -103,6 +103,8 @@ static int stm32lx_lock_program_memory(struct flash_bank *bank); static int stm32lx_enable_write_half_page(struct flash_bank *bank); static int stm32lx_erase_sector(struct flash_bank *bank, int sector); static int stm32lx_wait_until_bsy_clear(struct flash_bank *bank); +static int stm32lx_lock(struct flash_bank *bank); +static int stm32lx_unlock(struct flash_bank *bank); static int stm32lx_mass_erase(struct flash_bank *bank); static int stm32lx_wait_until_bsy_clear_timeout(struct flash_bank *bank, int timeout); @@ -286,6 +288,46 @@ COMMAND_HANDLER(stm32lx_handle_mass_erase_command) return retval; } +COMMAND_HANDLER(stm32lx_handle_lock_command) +{ + if (CMD_ARGC < 1) + return ERROR_COMMAND_SYNTAX_ERROR; + + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; + + retval = stm32lx_lock(bank); + + if (retval == ERROR_OK) + command_print(CMD_CTX, "STM32Lx locked, takes effect after power cycle."); + else + command_print(CMD_CTX, "STM32Lx lock failed"); + + return retval; +} + +COMMAND_HANDLER(stm32lx_handle_unlock_command) +{ + if (CMD_ARGC < 1) + return ERROR_COMMAND_SYNTAX_ERROR; + + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; + + retval = stm32lx_unlock(bank); + + if (retval == ERROR_OK) + command_print(CMD_CTX, "STM32Lx unlocked, takes effect after power cycle."); + else + command_print(CMD_CTX, "STM32Lx unlock failed"); + + return retval; +} + static int stm32lx_protect_check(struct flash_bank *bank) { int retval; @@ -897,6 +939,20 @@ static const struct command_registration stm32lx_exec_command_handlers[] = { .usage = "bank_id", .help = "Erase entire flash device. including available EEPROM", }, + { + .name = "lock", + .handler = stm32lx_handle_lock_command, + .mode = COMMAND_EXEC, + .usage = "bank_id", + .help = "Increase the readout protection to Level 1.", + }, + { + .name = "unlock", + .handler = stm32lx_handle_unlock_command, + .mode = COMMAND_EXEC, + .usage = "bank_id", + .help = "Lower the readout protection from Level 1 to 0.", + }, COMMAND_REGISTRATION_DONE }; @@ -1230,33 +1286,37 @@ static int stm32lx_obl_launch(struct flash_bank *bank) return tries ? ERROR_OK : ERROR_FAIL; } -static int stm32lx_mass_erase(struct flash_bank *bank) +static int stm32lx_lock(struct flash_bank *bank) { int retval; struct target *target = bank->target; - struct stm32lx_flash_bank *stm32lx_info = NULL; - uint32_t reg32; if (target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } - stm32lx_info = bank->driver_priv; - retval = stm32lx_unlock_options_bytes(bank); if (retval != ERROR_OK) return retval; - /* mass erase flash memory */ /* set the RDP protection level to 1 */ retval = target_write_u32(target, OPTION_BYTES_ADDRESS, OPTION_BYTE_0_PR1); if (retval != ERROR_OK) return retval; - retval = stm32lx_obl_launch(bank); - if (retval != ERROR_OK) - return retval; + return ERROR_OK; +} + +static int stm32lx_unlock(struct flash_bank *bank) +{ + int retval; + struct target *target = bank->target; + + if (target->state != TARGET_HALTED) { + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } retval = stm32lx_unlock_options_bytes(bank); if (retval != ERROR_OK) @@ -1271,6 +1331,35 @@ static int stm32lx_mass_erase(struct flash_bank *bank) if (retval != ERROR_OK) return retval; + return ERROR_OK; +} + +static int stm32lx_mass_erase(struct flash_bank *bank) +{ + int retval; + struct target *target = bank->target; + struct stm32lx_flash_bank *stm32lx_info = NULL; + uint32_t reg32; + + if (target->state != TARGET_HALTED) { + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } + + stm32lx_info = bank->driver_priv; + + retval = stm32lx_lock(bank); + if (retval != ERROR_OK) + return retval; + + retval = stm32lx_obl_launch(bank); + if (retval != ERROR_OK) + return retval; + + retval = stm32lx_unlock(bank); + if (retval != ERROR_OK) + return retval; + retval = stm32lx_obl_launch(bank); if (retval != ERROR_OK) return retval; -- ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
