flash: fix error handling

sensible error must be reported at failure site

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

diff --git a/src/flash/nand/tcl.c b/src/flash/nand/tcl.c
index 7b848880db7373e282aef1fd6dcfbca24488af6a..57bbe00e5c379cffd550e87993cb39cd33e538f7 100644 (file)
--- a/src/flash/nand/tcl.c
+++ b/src/flash/nand/tcl.c
@@ -150,16 +150,8 @@ COMMAND_HANDLER(handle_nand_probe_command)
                command_print(CMD_CTX, "NAND flash device '%s (%s)' found",
                                p->device->name, p->manufacturer->name);
        }
                command_print(CMD_CTX, "NAND flash device '%s (%s)' found",
                                p->device->name, p->manufacturer->name);
        }

-       else if (retval == ERROR_NAND_OPERATION_FAILED)
-       {
-               command_print(CMD_CTX, "probing failed for NAND flash device");
-       }
-       else
-       {
-               command_print(CMD_CTX, "unknown error when probing NAND flash device");
-       }

 
 

-       return ERROR_OK;
+       return retval;

 }
 
 COMMAND_HANDLER(handle_nand_erase_command)
 }
 
 COMMAND_HANDLER(handle_nand_erase_command)


@@ -206,16 +198,8 @@ COMMAND_HANDLER(handle_nand_erase_command)
                                offset, offset + length,
                                CMD_ARGV[0], p->device->name);
        }
                                offset, offset + length,
                                CMD_ARGV[0], p->device->name);
        }

-       else if (retval == ERROR_NAND_OPERATION_FAILED)
-       {
-               command_print(CMD_CTX, "erase failed");
-       }
-       else
-       {
-               command_print(CMD_CTX, "unknown error when erasing NAND flash device");
-       }

 
 

-       return ERROR_OK;
+       return retval;

 }
 
 COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 }
 
 COMMAND_HANDLER(handle_nand_check_bad_blocks_command)


@@ -261,18 +245,8 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
                command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
                                "use \"nand info\" command to list blocks");
        }
                command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
                                "use \"nand info\" command to list blocks");
        }

-       else if (retval == ERROR_NAND_OPERATION_FAILED)
-       {
-               command_print(CMD_CTX, "error when checking for bad blocks on "
-                               "NAND flash device");
-       }
-       else
-       {
-               command_print(CMD_CTX, "unknown error when checking for bad "
-                               "blocks on NAND flash device");
-       }

 
 

-       return ERROR_OK;
+       return retval;

 }
 
 COMMAND_HANDLER(handle_nand_write_command)
 }
 
 COMMAND_HANDLER(handle_nand_write_command)

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index 3dc6cff3fd47bce92ea9776832348856431c7a2d..8604b4b33a66eb07d9d0e191dec78e0d827956c1 100644 (file)
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -132,23 +132,14 @@ COMMAND_HANDLER(handle_flash_probe_command)
                {
                        command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
                }
                {
                        command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
                }

-               else if (retval == ERROR_FLASH_BANK_INVALID)
-               {
-                       command_print(CMD_CTX, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
-                                                 CMD_ARGV[0], p->base);
-               }
-               else
-               {
-                       command_print(CMD_CTX, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
-                                                 CMD_ARGV[0], p->base);
-               }

        }
        else
        {
                command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);
        }
        else
        {
                command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);

+               retval = ERROR_FAIL;

        }
 
        }
 

-       return ERROR_OK;
+       return retval;

 }
 
 COMMAND_HANDLER(handle_flash_erase_check_command)
 }
 
 COMMAND_HANDLER(handle_flash_erase_check_command)