From patchwork Thu Jun 27 11:52:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1123314 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="d5iMhQGl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45ZJFR1JnSz9s4Y for ; Thu, 27 Jun 2019 21:53:31 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C4649C21E13; Thu, 27 Jun 2019 11:53:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E9E6EC21C29; Thu, 27 Jun 2019 11:53:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 90852C21C29; Thu, 27 Jun 2019 11:52:59 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lists.denx.de (Postfix) with ESMTPS id 3D29FC21C93 for ; Thu, 27 Jun 2019 11:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1561636377; bh=ANmtuBAZqh+9WY5waEXVOS11BE8MpBcVmldnA5PtWyA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=d5iMhQGl1JJK8KHPYkoHtx5/QveRL0YM6cFmhN2X1vNa6EPh55zqUJOJLzjuoGX2I LyVSox/LhAAD5HenI2uQmyToRUJ6+mi7MeCBUN6Qc93z0/M6/Ulnn383RxggzLWp8u 9bjAr0q59wPfUS7IEwpNkI8fhPiFC1gsS/wHk9dA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([37.60.4.231]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MTBsk-1i6LJX1hmY-00SAR5; Thu, 27 Jun 2019 13:52:57 +0200 From: Frank Wunderlich To: Simon Goldschmidt , u-boot@lists.denx.de Date: Thu, 27 Jun 2019 13:52:41 +0200 Message-Id: <20190627115242.12005-2-frank-w@public-files.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190627115242.12005-1-frank-w@public-files.de> References: <20190627115242.12005-1-frank-w@public-files.de> X-Provags-ID: V03:K1:3mvwp4mSk3ZkGOBKa55DGxFAvYBBYaukFja+m8bMF6SScICZfSr KBb5DIrq2zYQGg2Y9jYTSnzIgsQhT/jYW0May+WlMGPRJ0G/5p4uIPmYsI1vhQKPoITsZBy Y2X7Oj+pGgNKPAQ3TT7ztd/8afysOjCjWXzdQ3uPZPZMeJAE7qEF34sEKeHhBvqyzUKFNi4 se0jV+A/6UlnzZjvuPAjw== X-UI-Out-Filterresults: notjunk:1; V03:K0:dGbSZpn2DPQ=:6nnYNsRSyzP+fQnTFt0Y6+ RPtswShMSEqFghmmPgdQaJR7iM/5mLq+2ZpxbZZ7tUxdfYxhEtVRltnCEfRxQubip9P+zHYvZ FxvRf3Z/4qUiJ6ovLjrX1zE7zDshQy8QTWUjbhM41g4pg7VN1QGlkcMSC1bgo+ACvQSEFBh0R 1zIAcumRM0XF2q23jyjLozq1jhukPcvc5YP0Y3NLHR6ue8vH4waB6jB3HUqPVoeln95o0h9wU kFrHcm2yVXTRLTOo/bzzClTzIm/ObCSWIUsL08CvdhrvDZLGqzrfoKNQDfTPb6q4RzAhLyVkE koOootJyJzZYfJsNt4q55+2oDVKoT4aJOf5094NAoImVNS8mx1m9ARwrq/eCtQUNOkFXuVcP1 oQdEnsRSQm1/jApP2qON4jKf5I7QCl8ImOVYjLKxrvrBGrXtyg1j1kYe2jXSzJreF9uDOT+Wi izmvREuThGsqbF+0t8/Xks5nY2U0xg+pJc4iOvrccdZwQ5ftR0Avg25pqzyHqGZdyUIK0Uzxj kTIYbnUWNmmRGijA9dzOnY+GNPZ5bT/I5y7NhK9X/sWLwWijnWRwZR67FDuzndgnuEQfwx6ZQ aVYBZS4aG+I8aoFgYLAcc1CtbzV+KzmjcnD2ShglMGX/PMpZP+Iw6G+aloD9ABpZXEGg31sgt 0bzla9uyN/m3tI6Gm6K0n+Lm7buJcTs+DXM9Jq/m+S1daD8+XR45p5p3OPo+kpmTP0nds1SxP t8V+4xfOIs9tyZexthPU1YET3NO5IdAoeH+iKQl1jEDUphKVqKaEqeuT/GhOmdpwjjuWidYyD y78kdjV4o+fYtZE5aYSJIJezzmSGPRD/DkIKcJg/CIkhCJyNPyv7yXR9VEbBlpXPGwi65Byt2 vfsE63OFpP+/u4q3Kx9QzWjpC1pwGTpBMa10BvovifqMgivayEKccpqPzY8K64YZPvtzSSg65 IIGxqvfHYlA+rnZ8ctqDEhNwd2wDTj6pp86bbfOIQOC0k6qvAjujnpXkeHvx16dnchyeUJGyC 9n02br+CqwOxEBf/Iu85C9QVsgTL7IaxqBaCLib2rXiSsjheNLfHVV7PsUguA3qPrEkX13ei6 mc1mf6hg6HgLN4= Subject: [U-Boot] [PATCH v6 1/2] env: register erase command X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" this patch adds basic changes for adding a erase-subcommand to env with this command the environment stored on non-volatile storage written by saveenv can be cleared. Signed-off-by: Frank Wunderlich squashed fixes - start message with "Erasing" - mark erase-function as optional - env: separate eraseenv from saveenv Suggested-by: Simon Goldschmidt --- cmd/Kconfig | 8 ++++++++ cmd/nvedit.c | 20 ++++++++++++++++++++ env/env.c | 30 ++++++++++++++++++++++++++++++ include/environment.h | 17 +++++++++++++++++ 4 files changed, 75 insertions(+) -- 2.17.1 diff --git a/cmd/Kconfig b/cmd/Kconfig index 0badcb3fe0..77e8a542d9 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -408,6 +408,14 @@ config CMD_SAVEENV Save all environment variables into the compiled-in persistent storage. +config CMD_ERASEENV + bool "eraseenv" + default n + depends on CMD_SAVEENV + help + Erase environment variables from the compiled-in persistent + storage. + config CMD_ENV_EXISTS bool "env exists" default y diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 52c242b4f6..63de758534 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -761,6 +761,20 @@ U_BOOT_CMD( "save environment variables to persistent storage", "" ); + +#if defined(CONFIG_CMD_ERASEENV) +static int do_env_erase(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return env_erase() ? 1 : 0; +} + +U_BOOT_CMD( + eraseenv, 1, 0, do_env_erase, + "erase environment variables from persistent storage", + "" +); +#endif #endif #endif /* CONFIG_SPL_BUILD */ @@ -1207,6 +1221,9 @@ static cmd_tbl_t cmd_env_sub[] = { #endif #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) U_BOOT_CMD_MKENT(save, 1, 0, do_env_save, "", ""), +#if defined(CONFIG_CMD_ERASEENV) + U_BOOT_CMD_MKENT(erase, 1, 0, do_env_erase, "", ""), +#endif #endif U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), #if defined(CONFIG_CMD_ENV_EXISTS) @@ -1282,6 +1299,9 @@ static char env_help_text[] = #endif #if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE) "env save - save environment\n" +#if defined(CONFIG_CMD_ERASEENV) + "env erase - erase environment\n" +#endif #endif #if defined(CONFIG_CMD_NVEDIT_EFI) "env set -e name [arg ...] - set UEFI variable; unset if 'arg' not specified\n" diff --git a/env/env.c b/env/env.c index 4b417b90a2..d3cbe2f915 100644 --- a/env/env.c +++ b/env/env.c @@ -24,6 +24,8 @@ void env_fix_drivers(void) entry->load += gd->reloc_off; if (entry->save) entry->save += gd->reloc_off; + if (entry->erase) + entry->erase += gd->reloc_off; if (entry->init) entry->init += gd->reloc_off; } @@ -254,6 +256,34 @@ int env_save(void) return -ENODEV; } +int env_erase(void) +{ + struct env_driver *drv; + + drv = env_driver_lookup(ENVOP_ERASE, gd->env_load_prio); + if (drv) { + int ret; + + if (!drv->erase) + return -ENODEV; + + if (!env_has_inited(drv->location)) + return -ENODEV; + + printf("Erasing Environment on %s... ", drv->name); + ret = drv->erase(); + if (ret) + printf("Failed (%d)\n", ret); + else + printf("OK\n"); + + if (!ret) + return 0; + } + + return -ENODEV; +} + int env_init(void) { struct env_driver *drv; diff --git a/include/environment.h b/include/environment.h index cd96676141..de67cf4f0e 100644 --- a/include/environment.h +++ b/include/environment.h @@ -200,6 +200,7 @@ enum env_operation { ENVOP_INIT, /* we want to call the init function */ ENVOP_LOAD, /* we want to call the load function */ ENVOP_SAVE, /* we want to call the save function */ + ENVOP_ERASE, /* we want to call the erase function */ }; struct env_driver { @@ -225,6 +226,15 @@ struct env_driver { */ int (*save)(void); + /** + * erase() - Erase the environment on storage + * + * This method is optional and required for 'eraseenv' to work. + * + * @return 0 if OK, -ve on error + */ + int (*erase)(void); + /** * init() - Set up the initial pre-relocation environment * @@ -303,6 +313,13 @@ int env_load(void); */ int env_save(void); +/** + * env_erase() - Erase the environment on storage + * + * @return 0 if OK, -ve on error + */ +int env_erase(void); + /** * env_fix_drivers() - Updates envdriver as per relocation */