jtag: jtag_add_ir_scan() now takes a single field

[openocd.git] / src / flash / nor / str9x.c

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index bf3f750f192dc956d9a584005a5bb65ff423ab44..0875851e02d11342721711b63bf4dff16a1f641e 100644 (file)
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -230,17 +230,9 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                return ERROR_TARGET_NOT_HALTED;
        }
 
-       /* Check if we erase whole bank */
-       if ((first == 0) && (last == (bank->num_sectors - 1)))
-       {
-               /* Optimize to run erase bank command instead of sector */
-               erase_cmd = 0x80;
-       }
-       else
-       {
-               /* Erase sector command */
-               erase_cmd = 0x20;
-       }
+       /*A slower but stable way of erasing*/
+       /* Erase sector command */
+       erase_cmd = 0x20;
 
        for (i = first; i <= last; i++)
        {
@@ -296,10 +288,6 @@ static int str9x_erase(struct flash_bank *bank, int first, int last)
                        LOG_ERROR("error erasing flash bank, status: 0x%x", status);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
-
-               /* If we ran erase bank command, we are finished */
-               if (erase_cmd == 0x80)
-                       break;
        }
 
        for (i = first; i <= last; i++)
@@ -680,7 +668,7 @@ COMMAND_HANDLER(str9x_handle_flash_config_command)
 static const struct command_registration str9x_config_command_handlers[] = {
        {
                .name = "flash_config",
-               .handler = &str9x_handle_flash_config_command,
+               .handler = str9x_handle_flash_config_command,
                .mode = COMMAND_EXEC,
                .help = "Configure str9x flash controller, prior to "
                        "programming the flash.",
@@ -699,15 +687,15 @@ static const struct command_registration str9x_command_handlers[] = {
 };
 
 struct flash_driver str9x_flash = {
-               .name = "str9x",
-               .commands = str9x_command_handlers,
-               .flash_bank_command = &str9x_flash_bank_command,
-               .erase = &str9x_erase,
-               .protect = &str9x_protect,
-               .write = &str9x_write,
-               .probe = &str9x_probe,
-               .auto_probe = &str9x_probe,
-               .erase_check = &default_flash_blank_check,
-               .protect_check = &str9x_protect_check,
-               .info = &str9x_info,
-       };
+       .name = "str9x",
+       .commands = str9x_command_handlers,
+       .flash_bank_command = str9x_flash_bank_command,
+       .erase = str9x_erase,
+       .protect = str9x_protect,
+       .write = str9x_write,
+       .probe = str9x_probe,
+       .auto_probe = str9x_probe,
+       .erase_check = default_flash_blank_check,
+       .protect_check = str9x_protect_check,
+       .info = str9x_info,
+};