[U-Boot,v2,2/2] env: mmc: add erase-function

Message ID	20190408103345.5884-3-frank-w@public-files.de
State	Superseded
Delegated to:	Tom Rini
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: Frank Wunderlich <frank-w@public-files.de> To: u-boot@lists.denx.de Date: Mon, 8 Apr 2019 12:33:45 +0200 Message-Id: <20190408103345.5884-3-frank-w@public-files.de> In-Reply-To: <20190408103345.5884-1-frank-w@public-files.de> References: <20190408103345.5884-1-frank-w@public-files.de> Subject: [U-Boot] [PATCH v2 2/2] env: mmc: add erase-function Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	add env erase \| expand [U-Boot,v2,0/2] add env erase [U-Boot,v2,1/2] env: register erase command [U-Boot,v2,2/2] env: mmc: add erase-function

Message ID

20190408103345.5884-3-frank-w@public-files.de

State

Superseded

Delegated to:

Tom Rini

Headers

From: Frank Wunderlich <frank-w@public-files.de>
To: u-boot@lists.denx.de
Date: Mon,  8 Apr 2019 12:33:45 +0200
Message-Id: <20190408103345.5884-3-frank-w@public-files.de>
In-Reply-To: <20190408103345.5884-1-frank-w@public-files.de>
References: <20190408103345.5884-1-frank-w@public-files.de>
Subject: [U-Boot] [PATCH v2 2/2] env: mmc: add erase-function
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

add env erase | expand

Commit Message

Frank Wunderlich April 8, 2019, 10:33 a.m. UTC

Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
---
 env/mmc.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

--
2.17.1

diff --git a/env/mmc.c b/env/mmc.c
index c5b6356363..f387a53970 100644
--- a/env/mmc.c
+++ b/env/mmc.c
@@ -245,7 +245,28 @@  fini:

 static int env_mmc_erase(void)
 {
-	return 0;//1 on error
+	int dev = mmc_get_env_dev();
+	struct mmc *mmc = find_mmc_device(dev);
+	int	n, blk, cnt;
+
+	if (!mmc)
+		return CMD_RET_FAILURE;
+
+	blk = CONFIG_ENV_OFFSET / mmc->read_bl_len;
+	cnt = CONFIG_ENV_SIZE / mmc->read_bl_len;
+
+	printf("\nMMC erase env: dev # %d, block # %d (0x%x), count %d (0x%x)\n",
+	       dev, blk, blk * mmc->read_bl_len,
+	       cnt, cnt * mmc->read_bl_len);
+
+	if (mmc_getwp(mmc) == 1) {
+		printf("Error: card is write protected!\n");
+		return CMD_RET_FAILURE;
+	}
+	n = blk_derase(mmc_get_blk_desc(mmc), blk, cnt);
+	printf("%d blocks erased: %s\n", n, (n == cnt) ? "OK" : "ERROR");
+
+	return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }

 #endif /* CONFIG_CMD_SAVEENV && !CONFIG_SPL_BUILD */

[U-Boot,v2,2/2] env: mmc: add erase-function

Commit Message

Patch