summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-03-03 00:41:05 +0000
committerLeah Rowe <leah@libreboot.org>2026-03-03 00:41:05 +0000
commitdfbb3c5d9e7a5b7baf405e694f64c8f3642d8b40 (patch)
tree98a07141240d435fdf134d6ea230e15a16dd15ca
parent2b01e023abff6a75b5033978200ce156ac9c643a (diff)
util/nvmutil: merge nvmalloc with readGbe
it's so simply now, all it does is set the gbe pointers Signed-off-by: Leah Rowe <leah@libreboot.org>
-rw-r--r--util/nvmutil/nvmutil.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c
index c9b29051..19217df8 100644
--- a/util/nvmutil/nvmutil.c
+++ b/util/nvmutil/nvmutil.c
@@ -15,7 +15,7 @@
#include <unistd.h>
void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void),
- cmd_dump(void), cmd_setmac(void), nvmalloc(void), readGbe(void),
+ cmd_dump(void), cmd_setmac(void), readGbe(void),
checkdir(const char *path), macf(int partnum), hexdump(int partnum),
parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void),
openFiles(void), cmd_copy(void), writeGbe_part(int),
@@ -91,7 +91,6 @@ main(int argc, char *argv[])
#ifdef __OpenBSD__
err_if(pledge("stdio", NULL) == -1);
#endif
- nvmalloc();
readGbe();
(*cmd)();
writeGbe();
@@ -186,15 +185,11 @@ xopen(int *f, const char *l, int p, struct stat *st)
}
void
-nvmalloc(void)
+readGbe(void)
{
gbe[0] = buf;
gbe[1] = buf + SIZE_4KB;
-}
-void
-readGbe(void)
-{
for (int p = 0; p < 2; p++)
readGbe_part(p);
}