stm32f1x: fix bug in flash loader and restrict instruction set to armv6-m

[fw/openocd] / src / flash / nand / tcl.c

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 29d4e1e1d3302f25dc69da877c04299b3d512c86..c52c347fd59d7b1df61fa6c6a89967199b6beeec 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -196,7 +196,7 @@ COMMAND_HANDLER(handle_nand_erase_command)
        {
                command_print(CMD_CTX, "erased blocks %lu to %lu "
                                "on NAND flash device #%s '%s'",
-                               offset, offset + length,
+                               offset, offset + length - 1,
                                CMD_ARGV[0], p->device->name);
        }
 
@@ -581,7 +581,6 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
        retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
        if (ERROR_OK != retval)
        {
-               assert(controller->usage != NULL);
                LOG_ERROR("'%s' driver rejected nand flash. Usage: %s",
                        controller->name,
                        controller->usage);
@@ -589,6 +588,9 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
                return retval;
        }
 
+       if (controller->usage == NULL)
+               LOG_DEBUG("'%s' driver usage field missing", controller->name);
+
        nand_device_add(c);
 
        return ERROR_OK;