flash: use bkpt for str9 flash algo algorithm
authorSpencer Oliver <ntfreak@users.sourceforge.net>
Fri, 16 Jul 2010 21:52:49 +0000 (22:52 +0100)
committerSpencer Oliver <ntfreak@users.sourceforge.net>
Fri, 16 Jul 2010 21:52:49 +0000 (22:52 +0100)
STR9 is ARMv5 arch so use bkpt instruction rather than
waste a breakpoint.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
src/flash/nor/str9x.c

index 103af16de5f42ecd74d17dd07d9c34adae67697b..528e52e26901c0e32d0d05a8c98be5a35da982b3 100644 (file)
@@ -369,7 +369,7 @@ static int str9x_write_block(struct flash_bank *bank,
                0xe2522001,     /*      subs r2, r2, #1         */
                0x1affffed,     /*      bne write                       */
                                        /* exit:                                */
-               0xeafffffe,     /*      b exit                          */
+               0xe1200070,     /*      bkpt #0                         */
        };
 
        /* flash write code */
@@ -421,8 +421,7 @@ static int str9x_write_block(struct flash_bank *bank,
 
                if ((retval = target_run_algorithm(target, 0, NULL, 4, reg_params,
                                str9x_info->write_algorithm->address,
-                               str9x_info->write_algorithm->address + (sizeof(str9x_flash_write_code) - 4),
-                               10000, &armv4_5_info)) != ERROR_OK)
+                               0, 10000, &armv4_5_info)) != ERROR_OK)
                {
                        LOG_ERROR("error executing str9x flash write algorithm");
                        retval = ERROR_FLASH_OPERATION_FAILED;