flash: fix stellaris class regression

[fw/openocd] / src / flash / nor / ocl.c

diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c
index 57d9efaaaa6f78f8e3bab54cd08ed410c751b8d5..2dd4f52185ad0b129bed17366c8459968801f400 100644 (file)
--- a/src/flash/nor/ocl.c
+++ b/src/flash/nor/ocl.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
+#include "imp.h"
 #include "ocl.h"
-#include "flash.h"
 #include <target/embeddedice.h>
 
 
@@ -51,8 +51,7 @@ FLASH_BANK_COMMAND_HANDLER(ocl_flash_bank_command)
 
        if (CMD_ARGC < 6)
        {
-               LOG_WARNING("incomplete flash_bank ocl configuration");
-               return ERROR_FLASH_BANK_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        arm7_9 = target_to_arm7_9(bank->target);
@@ -101,8 +100,6 @@ static int ocl_erase(struct flash_bank *bank, int first, int last)
        /* wait for response, fixed timeout of 1 s */
        if ((retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 1000) != ERROR_OK))
        {
-               if (retval == ERROR_TARGET_TIMEOUT)
-                       LOG_ERROR("loader not responding");
                return retval;
        }
 
@@ -206,8 +203,6 @@ static int ocl_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
                /* wait for response, fixed timeout of 1 s */
                if ((retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 1000) != ERROR_OK))
                {
-                       if (retval == ERROR_TARGET_TIMEOUT)
-                               LOG_ERROR("loader not responding");
                        free(dcc_buffer);
                        return retval;
                }
@@ -252,8 +247,6 @@ static int ocl_probe(struct flash_bank *bank)
        /* wait for response, fixed timeout of 1 s */
        if ((retval = embeddedice_handshake(ocl->jtag_info, EICE_COMM_CTRL_WBIT, 1000) != ERROR_OK))
        {
-               if (retval == ERROR_TARGET_TIMEOUT)
-                       LOG_ERROR("loader not responding");
                return retval;
        }
 
@@ -348,14 +341,15 @@ static int ocl_auto_probe(struct flash_bank *bank)
 }
 
 struct flash_driver ocl_flash = {
-               .name = "ocl",
-               .flash_bank_command = &ocl_flash_bank_command,
-               .erase = &ocl_erase,
-               .protect = &ocl_protect,
-               .write = &ocl_write,
-               .probe = &ocl_probe,
-               .erase_check = &ocl_erase_check,
-               .protect_check = &ocl_protect_check,
-               .info = &ocl_info,
-               .auto_probe = &ocl_auto_probe,
-       };
+       .name = "ocl",
+       .flash_bank_command = ocl_flash_bank_command,
+       .erase = ocl_erase,
+       .protect = ocl_protect,
+       .write = ocl_write,
+       .read = default_flash_read,
+       .probe = ocl_probe,
+       .erase_check = ocl_erase_check,
+       .protect_check = ocl_protect_check,
+       .info = ocl_info,
+       .auto_probe = ocl_auto_probe,
+};