diff mbox

[U-Boot,v3,1/2] cmd_sf: Add print mesg for 'sf erase' command

Message ID 7d2959d1-82c1-4558-a99b-815c31b6e1a5@CO9EHSMHS009.ehs.local
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Jagannadha Sutradharudu Teki May 27, 2013, 8:11 p.m. UTC
This patch adds a print messages while using 'sf erase' command
to make sure that how many bytes erased in flash device.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 common/cmd_sf.c             |    8 +++-----
 drivers/mtd/spi/spi_flash.c |    7 ++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

Comments

Jagan Teki June 2, 2013, 6:44 p.m. UTC | #1
On 27-05-2013 15:41, Jagannadha Sutradharudu Teki wrote:
> This patch adds a print messages while using 'sf erase' command
> to make sure that how many bytes erased in flash device.
>
> Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
>
> ---
> common/cmd_sf.c             |    8 +++-----
>   drivers/mtd/spi/spi_flash.c |    7 ++-----
>   2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/common/cmd_sf.c b/common/cmd_sf.c
> index 1daff70..12d1aca 100644
> --- a/common/cmd_sf.c
> +++ b/common/cmd_sf.c
> @@ -305,12 +305,10 @@ static int do_spi_flash_erase(int argc, char * const argv[])
>   	}
>   
>   	ret = spi_flash_erase(flash, offset, len);
> -	if (ret) {
> -		printf("SPI flash %s failed\n", argv[0]);
> -		return 1;
> -	}
> +	printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
> +			ret ? "ERROR" : "OK");
>   
> -	return 0;
> +	return ret == 0 ? 0 : 1;
>   }
>   
>   #ifdef CONFIG_CMD_SF_TEST
> diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
> index d2bee3a..77938d3 100644
> --- a/drivers/mtd/spi/spi_flash.c
> +++ b/drivers/mtd/spi/spi_flash.c
> @@ -206,7 +206,7 @@ int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
>   
>   int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
>   {
> -	u32 start, end, erase_size;
> +	u32 end, erase_size;
>   	int ret;
>   	u8 cmd[4];
>   
> @@ -226,8 +226,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
>   		cmd[0] = CMD_ERASE_4K;
>   	else
>   		cmd[0] = CMD_ERASE_64K;
> -	start = offset;
> -	end = start + len;
> +	end = offset + len;
>   
>   	while (offset < end) {
>   		spi_flash_addr(offset, cmd);
> @@ -251,8 +250,6 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
>   			goto out;
>   	}
>   
> -	debug("SF: Successfully erased %zu bytes @ %#x\n", len, start);
> -
>    out:
>   	spi_release_bus(flash->spi);
>   	return ret;
Applied to u-boot-spi/master

--
Thanks,
Jagan.
diff mbox

Patch

diff --git a/common/cmd_sf.c b/common/cmd_sf.c
index 1daff70..12d1aca 100644
--- a/common/cmd_sf.c
+++ b/common/cmd_sf.c
@@ -305,12 +305,10 @@  static int do_spi_flash_erase(int argc, char * const argv[])
 	}
 
 	ret = spi_flash_erase(flash, offset, len);
-	if (ret) {
-		printf("SPI flash %s failed\n", argv[0]);
-		return 1;
-	}
+	printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
+			ret ? "ERROR" : "OK");
 
-	return 0;
+	return ret == 0 ? 0 : 1;
 }
 
 #ifdef CONFIG_CMD_SF_TEST
diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index d2bee3a..77938d3 100644
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -206,7 +206,7 @@  int spi_flash_cmd_wait_ready(struct spi_flash *flash, unsigned long timeout)
 
 int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
-	u32 start, end, erase_size;
+	u32 end, erase_size;
 	int ret;
 	u8 cmd[4];
 
@@ -226,8 +226,7 @@  int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 		cmd[0] = CMD_ERASE_4K;
 	else
 		cmd[0] = CMD_ERASE_64K;
-	start = offset;
-	end = start + len;
+	end = offset + len;
 
 	while (offset < end) {
 		spi_flash_addr(offset, cmd);
@@ -251,8 +250,6 @@  int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 			goto out;
 	}
 
-	debug("SF: Successfully erased %zu bytes @ %#x\n", len, start);
-
  out:
 	spi_release_bus(flash->spi);
 	return ret;