flash: print bank usage on failure

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

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 5fba1bcc93d61e35852b77b39c2a8c2d0415de5a..6389377903baa64c4b17204d533f4091e772b39d 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -544,8 +544,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
 
        if (CMD_ARGC < 2)
        {
-               LOG_ERROR("missing target");
-               return ERROR_COMMAND_ARGUMENT_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
        target = get_target(CMD_ARGV[1]);
        if (!target) {
@@ -582,11 +581,16 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
        retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
        if (ERROR_OK != retval)
        {
-               LOG_ERROR("'%s' driver rejected nand flash", controller->name);
+               LOG_ERROR("'%s' driver rejected nand flash. Usage: %s",
+                       controller->name,
+                       controller->usage);
                free(c);
-               return ERROR_OK;
+               return retval;
        }
 
+       if (controller->usage == NULL)
+               LOG_DEBUG("'%s' driver usage field missing", controller->name);
+
        nand_device_add(c);
 
        return ERROR_OK;
@@ -596,8 +600,7 @@ COMMAND_HANDLER(handle_nand_device_command)
 {
        if (CMD_ARGC < 2)
        {
-               LOG_ERROR("incomplete nand device configuration");
-               return ERROR_FLASH_BANK_INVALID;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        // save name and increment (for compatibility) with drivers
@@ -628,12 +631,14 @@ static const struct command_registration nand_config_command_handlers[] = {
                .handler = &handle_nand_list_drivers,
                .mode = COMMAND_ANY,
                .help = "lists available NAND drivers",
+               .usage = ""
        },
        {
                .name = "init",
                .mode = COMMAND_CONFIG,
                .handler = &handle_nand_init_command,
                .help = "initialize NAND devices",
+               .usage = ""
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -642,6 +647,7 @@ static const struct command_registration nand_command_handlers[] = {
                .name = "nand",
                .mode = COMMAND_ANY,
                .help = "NAND flash command group",
+               .usage = "",
                .chain = nand_config_command_handlers,
        },
        COMMAND_REGISTRATION_DONE