From: Patrick Delaunay <patrick.delaunay@st.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 7/9] env: ext4: introduce new function env_ext4_save_buffer
Date: Tue, 16 Jun 2020 09:40:46 +0200 [thread overview]
Message-ID: <20200616074048.7898-8-patrick.delaunay@st.com> (raw)
In-Reply-To: <20200616074048.7898-1-patrick.delaunay@st.com>
Split the function env_ext4_save to prepare the erase support.
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---
(no changes since v1)
env/ext4.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/env/ext4.c b/env/ext4.c
index ac9f126bec..027a721b69 100644
--- a/env/ext4.c
+++ b/env/ext4.c
@@ -44,9 +44,8 @@ __weak const char *env_ext4_get_dev_part(void)
return (const char *)CONFIG_ENV_EXT4_DEVICE_AND_PART;
}
-static int env_ext4_save(void)
+static int env_ext4_save_buffer(env_t *env_new)
{
- env_t env_new;
struct blk_desc *dev_desc = NULL;
struct disk_partition info;
int dev, part;
@@ -54,10 +53,6 @@ static int env_ext4_save(void)
const char *ifname = env_ext4_get_intf();
const char *dev_and_part = env_ext4_get_dev_part();
- err = env_export(&env_new);
- if (err)
- return err;
-
part = blk_get_device_part_str(ifname, dev_and_part,
&dev_desc, &info, 1);
if (part < 0)
@@ -72,7 +67,7 @@ static int env_ext4_save(void)
return 1;
}
- err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)&env_new,
+ err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)env_new,
sizeof(env_t), FILETYPE_REG);
ext4fs_close();
@@ -81,9 +76,26 @@ static int env_ext4_save(void)
CONFIG_ENV_EXT4_FILE, ifname, dev, part);
return 1;
}
- gd->env_valid = ENV_VALID;
+ return 0;
+}
+
+static int env_ext4_save(void)
+{
+ env_t env_new;
+ int err;
+
+ err = env_export(&env_new);
+ if (err)
+ return err;
+
+ err = env_ext4_save_buffer(&env_new);
+ if (err)
+ return err;
+
+ gd->env_valid = ENV_VALID;
puts("done\n");
+
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2020-06-16 7:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 7:40 [PATCH v2 0/9] env: ext4: corrections and add test for env in ext4 Patrick Delaunay
2020-06-16 7:40 ` [PATCH v2 1/9] env: add absolute path at CONFIG_ENV_EXT4_FILE Patrick Delaunay
2020-06-18 19:25 ` Tom Rini
2020-06-16 7:40 ` [PATCH v2 2/9] env: ext4: set gd->env_valid Patrick Delaunay
2020-06-18 19:25 ` Tom Rini
2020-06-16 7:40 ` [PATCH v2 3/9] env: correctly handle result in env_init Patrick Delaunay
2020-06-18 19:15 ` Tom Rini
2020-06-19 14:14 ` Patrick DELAUNAY
2020-06-19 18:05 ` Tom Rini
2020-06-23 13:13 ` Patrick DELAUNAY
2020-06-23 15:16 ` Tom Rini
2020-06-24 11:19 ` Patrick DELAUNAY
2020-06-24 18:07 ` Tom Rini
2020-06-16 7:40 ` [PATCH v2 4/9] sandbox: activate env in ext4 support Patrick Delaunay
2020-06-16 7:40 ` [PATCH v2 5/9] sandbox: support the change of env location Patrick Delaunay
2020-06-17 3:12 ` Simon Glass
2020-06-18 19:17 ` Tom Rini
2020-06-19 14:40 ` Patrick DELAUNAY
2020-06-19 18:07 ` Tom Rini
2020-06-16 7:40 ` [PATCH v2 6/9] test: environment in ext4 Patrick Delaunay
2020-06-22 18:57 ` Stephen Warren
2020-06-23 18:00 ` Patrick DELAUNAY
2020-06-16 7:40 ` Patrick Delaunay [this message]
2020-06-16 7:40 ` [PATCH v2 8/9] env: ext4: add support of command env erase Patrick Delaunay
2020-06-16 7:40 ` [PATCH v2 9/9] test: sandbox: add test for erase command Patrick Delaunay
2020-06-17 3:12 ` Simon Glass
2020-06-22 18:58 ` Stephen Warren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200616074048.7898-8-patrick.delaunay@st.com \
--to=patrick.delaunay@st.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox