Skip to content

W
White Rabbit Switch - Software
Commit 91c22de9 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

barebox: add new patches for sdb commands 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 7c9f0d35
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1558 additions and 0 deletions
patches/barebox/v2014.04/0012-lib-sdb-bb-fixes-to-be-ported-in-fpga-config-space.patch 0 → 100644
View file @ 91c22de9
From 2a346543d6cb16c4e7e638641cc947c73fb43068 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Mon, 15 Sep 2014 11:40:01 +0200
Subject: [PATCH 12/14] lib/sdb: bb fixes (to be ported in fpga-config-space)
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
lib/sdb/libsdbfs-kernel.h | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/sdb/libsdbfs-kernel.h b/lib/sdb/libsdbfs-kernel.h
index 16e359e..a121d0e 100644
--- a/lib/sdb/libsdbfs-kernel.h
+++ b/lib/sdb/libsdbfs-kernel.h
@@ -1,7 +1,11 @@
#include <linux/types.h>
#include <linux/string.h>
-#include <linux/errno.h>
+#ifdef __BAREBOX__
+# include <errno.h>
+#else /* really linux */
+# include <linux/errno.h>
+#endif
#include <asm/byteorder.h>
/*
@@ -13,7 +17,9 @@
* is not installed in /usr/include/linux/types.h, so use it to check.
*/
#ifndef DECLARE_BITMAP
-# error "Please point LINUX to a source tree if you define __KERNEL__"
+# ifndef __BAREBOX__ /* Barebox looks like the kernel and misses the define */
+# error "Please point LINUX to a source tree if you define __KERNEL__"
+# endif
#endif
#define SDB_KERNEL 1
--
1.7.10.4
patches/barebox/v2014.04/0012-libsdb-integrate-in-build-system.patch 0 → 100644
View file @ 91c22de9
From 55893c8ebab97be71eacc2f4814a2b41616ec7c1 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Mon, 15 Sep 2014 11:40:34 +0200
Subject: [PATCH 12/13] libsdb: integrate in build system
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
lib/Kconfig | 3 +++
lib/Makefile | 1 +
lib/sdb/Makefile | 44 +-------------------------------------------
3 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/lib/Kconfig b/lib/Kconfig
index d9ad4aa..7a2884e 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -47,6 +47,9 @@ config LIBUBIGEN
config LIBMTD
bool
+config LIBSDB
+ bool
+
config STMP_DEVICE
bool
diff --git a/lib/Makefile b/lib/Makefile
index e8769a9..d4295fe 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -44,3 +44,4 @@ obj-y += gui/
obj-$(CONFIG_XYMODEM) += xymodem.o
obj-y += unlink-recursive.o
obj-$(CONFIG_STMP_DEVICE) += stmp-device.o
+obj-$(CONFIG_LIBSDB) += sdb/
diff --git a/lib/sdb/Makefile b/lib/sdb/Makefile
index 4699673..d3f06a4 100644
--- a/lib/sdb/Makefile
+++ b/lib/sdb/Makefile
@@ -1,43 +1 @@
-
-LINUX ?= /lib/modules/$(shell uname -r)/build
-
-# If we compile for the kernel, we need to include real kernel headers.
-# The thing is enough a mess that I moved it to a different file
-include Makefile.arch
-
-
-AS = $(CROSS_COMPILE)as
-LD = $(CROSS_COMPILE)ld
-CC = $(CROSS_COMPILE)gcc
-CPP = $(CC) -E
-AR = $(CROSS_COMPILE)ar
-NM = $(CROSS_COMPILE)nm
-STRIP = $(CROSS_COMPILE)strip
-OBJCOPY = $(CROSS_COMPILE)objcopy
-OBJDUMP = $(CROSS_COMPILE)objdump
-
-# calculate endianness at compile time
-ENDIAN := $(shell ./check-endian $(CC))
-
-CFLAGS = -Wall -ggdb -O2
-CFLAGS += -I../include/linux -I../include # for <sdb.h>
-CFLAGS += -ffunction-sections -fdata-sections
-CFLAGS += -Wno-pointer-sign
-CFLAGS += $(ENDIAN) $(LINUXINCLUDE)
-
-
-LIB = libsdbfs.a
-OBJS = glue.o access.o
-
-all: $(LIB)
-
-$(OBJS): $(wildcard *.h)
-
-$(LIB): $(OBJS)
- $(AR) r $@ $(OBJS)
-
-clean:
- rm -f $(OBJS) $(LIB) *~ core
-
-# add the other unused targets, so the rule in ../Makefile works
-modules install modules_install:
+obj-y += glue.o access.o
--
1.7.10.4
patches/barebox/v2014.04/0013-commands-add-sdb-commands-to-list-read-setvar.patch 0 → 100644
View file @ 91c22de9
From e5312e4e8b58dfe5480b6bd3e22470527cfb85f7 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Mon, 15 Sep 2014 11:40:59 +0200
Subject: [PATCH 13/13] commands: add sdb commands to list, read, setvar
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
commands/Kconfig | 7 ++
commands/Makefile | 1 +
commands/sdb.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 200 insertions(+)
create mode 100644 commands/sdb.c
diff --git a/commands/Kconfig b/commands/Kconfig
index 352e8bf..89cadec 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -756,6 +756,13 @@ config CMD_DETECT
actual probe of the client devices until they are needed. Use the
'detect' command on the physical device to trigger probing.
+config CMD_SDB
+ bool
+ select LIBSDB
+ prompt "commands for reading SDB information"
+ help
+ This enables "sdbinfo", "sdbset" and "sdbread".
+
menuconfig CMD_WD
bool
depends on WATCHDOG
diff --git a/commands/Makefile b/commands/Makefile
index 91ec0e9..e97291e 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -91,6 +91,7 @@ obj-$(CONFIG_CMD_FILETYPE) += filetype.o
obj-$(CONFIG_CMD_BAREBOX_UPDATE)+= barebox-update.o
obj-$(CONFIG_CMD_MIITOOL) += miitool.o
obj-$(CONFIG_CMD_DETECT) += detect.o
+obj-$(CONFIG_CMD_SDB) += sdb.o
obj-$(CONFIG_CMD_BOOT) += boot.o
obj-$(CONFIG_CMD_DEVINFO) += devinfo.o
obj-$(CONFIG_CMD_READF) += readf.o
diff --git a/commands/sdb.c b/commands/sdb.c
new file mode 100644
index 0000000..e0cd5a4
--- /dev/null
+++ b/commands/sdb.c
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2014 CERN.
+ * Author: Alessandro Rubini for BE-CO-HT (White Rabbit project)
+ *
+ * Please use according to GNU GPL 2 or later
+ */
+#include <common.h>
+#include <command.h>
+#include <init.h>
+#include <malloc.h>
+#include <errno.h>
+#include <fs.h>
+#include <fcntl.h>
+#include <xfuncs.h>
+#include <getopt.h>
+#include <environment.h>
+
+#include <../lib/sdb/libsdbfs.h> /* hackish */
+
+#define BUFSIZE 1024 /* like cat.c in this directory */
+
+/* This is the drvdata in the SDB information */
+struct bb_sdb_drvdata {
+ int fd;
+};
+
+static struct bb_sdb_drvdata drvdata;
+
+/* and how to read the thing: use straight barebox POSIX interface */
+static int bb_sdb_read(struct sdbfs *fs, int offset, void *buf, int count)
+{
+ struct bb_sdb_drvdata *dd = fs->drvdata;
+ int fd = dd->fd;
+
+ if (lseek(fd, offset, SEEK_SET) < 0)
+ return -1;
+ return read(fd, buf, count);
+}
+
+static struct sdbfs bb_sdb_instance = {
+ .drvdata = &drvdata,
+ .entrypoint = 0, /* unfortunately: to be fixed */
+ .read = bb_sdb_read,
+};
+
+/* The subcommands, assuming the device is opened and closed by the caller */
+static int bb_sdb_ls(void)
+{
+ struct sdb_device *d;
+ struct sdb_product *p;
+ struct sdb_component *c;
+ int new = 1;
+
+ while ( (d = sdbfs_scan(&bb_sdb_instance, new)) != NULL) {
+ new = 0; /* for next time */
+
+ c = &d->sdb_component;
+ p = &c->product;
+
+ printf("%016llx:%08x @ %08llx-%08llx ",
+ ntohll(p->vendor_id), ntohl(p->device_id),
+ ntohll(c->addr_first), ntohll(c->addr_last));
+ printf("%.19s\n", p->name);
+ }
+ return 0;
+}
+
+static int bb_sdb_cat(char *sdbfile)
+{ char *buf;
+ int i, j;
+
+ /*
+ * Read a file, skipping trailing 0x00 or 0xff bytes, as a convenience.
+ * The function is based on bb::commands/cat (Sascha Hauer)
+ */
+ i = sdbfs_open_name(&bb_sdb_instance, sdbfile);
+ if (i < 0) {
+ printf("can't open \"%s\" in SDB device\n", sdbfile);
+ return COMMAND_ERROR;
+ }
+ buf = xmalloc(BUFSIZE);
+
+ while ( (i = sdbfs_fread(&bb_sdb_instance, -1, buf, BUFSIZE)) > 0) {
+
+ /* trim trailing garbage as the file is assumed to be text */
+ j = i - 1;
+ while (j > 0 && (buf[j] == 0xff || buf[j] == 0x00))
+ j--;
+ for (i = 0; i <= j; i++)
+ putchar(buf[i]);
+ /* no ctrl-C support; this is expected to be fast */
+ }
+ /* most files have the trailing newline already, avoid adding it */
+ free(buf);
+ sdbfs_close(&bb_sdb_instance);
+ return 0;
+}
+
+static int bb_sdb_set(char *varname, char *sdbfile)
+{
+ char *buf;
+ int i;
+
+ i = sdbfs_open_name(&bb_sdb_instance, sdbfile);
+ if (i < 0) {
+ printf("can't open \"%s\" in SDB device\n", sdbfile);
+ return COMMAND_ERROR;
+ }
+ buf = xmalloc(BUFSIZE);
+ i = sdbfs_fread(&bb_sdb_instance, -1, buf, BUFSIZE);
+ sdbfs_close(&bb_sdb_instance);
+
+ while (i > 0 && (buf[i - 1] == 0xff || buf[i - 1] == 0x00)) {
+ /* trim trailing garbage as the file is assumed to be text */
+ i--;
+ }
+ if (i > 0 && buf[i - 1] == '\n')
+ i--; /* remove trailing newline too */
+ buf[i] = '\0';
+ setenv(varname, buf);
+ free(buf);
+ sdbfs_close(&bb_sdb_instance);
+ return 0;
+}
+
+
+/* And finally the real command */
+static int do_sdb(int argc, char *argv[])
+{
+ unsigned long entrypoint = 0;
+ int fd, ret, opt;
+
+ while ((opt = getopt(argc, argv, "e:")) > 0) {
+ switch (opt) {
+ case 'e':
+ entrypoint = simple_strtoul(optarg, NULL, 0);
+ break;
+ default:
+ return COMMAND_ERROR_USAGE;
+ }
+ }
+ argc -= (optind - 1);
+ argv += (optind - 1);
+ if (argc < 3)
+ return COMMAND_ERROR_USAGE;
+
+ /* for all subcommands we neet to create the device */
+ fd = open(argv[2], O_RDONLY);
+
+ if (fd < 0) {
+ printf("could not open %s: %s\n", argv[2], errno_str());
+ return fd;
+ }
+ drvdata.fd = fd;
+ bb_sdb_instance.entrypoint = entrypoint;
+ ret = sdbfs_dev_create(&bb_sdb_instance, 0 /* not verbose */);
+ if (ret != 0) {
+ printf("Error accessing SDB filesystem in \"%s\"\n",
+ argv[2]);
+ return COMMAND_ERROR;
+ }
+
+ /* now do the three subcommands */
+ ret = COMMAND_ERROR_USAGE;
+ if (!strcmp(argv[1], "ls")) {
+ if (argc == 3)
+ ret = bb_sdb_ls();
+ } else if (!strcmp(argv[1], "cat")) {
+ if (argc == 4)
+ ret = bb_sdb_cat(argv[3]);
+ } else if (!strcmp(argv[1], "set")) {
+ if (argc == 4 || argc == 5)
+ ret = bb_sdb_set(argv[3], argv[4] ?: argv[3]);
+ }
+ sdbfs_dev_destroy(&bb_sdb_instance);
+ return ret;
+}
+
+
+
+static const __maybe_unused char cmd_sdb_help[] =
+"Usage: sdb [options] <command> <dev> [<sdbfile>]"
+"\n"
+"\"sdb [-e <entrypoint>] ls <dev>\" lists device content\n"
+"\"sdb [-e <entrypoint>] cat <dev> <sdbfile>\" prints a file\n"
+"\"sdb [-e <entrypoint>] set <dev> <varname> [<file>]\" sets var from SDB\n";
+
+BAREBOX_CMD_START(sdb)
+ .cmd = do_sdb,
+ .usage = "read/use SDB information in device",
+ BAREBOX_CMD_HELP(cmd_sdb_help)
+BAREBOX_CMD_END
--
1.7.10.4
patches/barebox/v2014.04/0013-libsdb-integrate-in-build-system.patch 0 → 100644
View file @ 91c22de9
From a6e098cc24afd466441dbec4e7843dc04717e672 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Mon, 15 Sep 2014 11:40:34 +0200
Subject: [PATCH 13/14] libsdb: integrate in build system
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
lib/Kconfig | 3 +++
lib/Makefile | 1 +
lib/sdb/Makefile | 44 +-------------------------------------------
3 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/lib/Kconfig b/lib/Kconfig
index d9ad4aa..7a2884e 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -47,6 +47,9 @@ config LIBUBIGEN
config LIBMTD
bool
+config LIBSDB
+ bool
+
config STMP_DEVICE
bool
diff --git a/lib/Makefile b/lib/Makefile
index e8769a9..d4295fe 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -44,3 +44,4 @@ obj-y += gui/
obj-$(CONFIG_XYMODEM) += xymodem.o
obj-y += unlink-recursive.o
obj-$(CONFIG_STMP_DEVICE) += stmp-device.o
+obj-$(CONFIG_LIBSDB) += sdb/
diff --git a/lib/sdb/Makefile b/lib/sdb/Makefile
index 4699673..d3f06a4 100644
--- a/lib/sdb/Makefile
+++ b/lib/sdb/Makefile
@@ -1,43 +1 @@
-
-LINUX ?= /lib/modules/$(shell uname -r)/build
-
-# If we compile for the kernel, we need to include real kernel headers.
-# The thing is enough a mess that I moved it to a different file
-include Makefile.arch
-
-
-AS = $(CROSS_COMPILE)as
-LD = $(CROSS_COMPILE)ld
-CC = $(CROSS_COMPILE)gcc
-CPP = $(CC) -E
-AR = $(CROSS_COMPILE)ar
-NM = $(CROSS_COMPILE)nm
-STRIP = $(CROSS_COMPILE)strip
-OBJCOPY = $(CROSS_COMPILE)objcopy
-OBJDUMP = $(CROSS_COMPILE)objdump
-
-# calculate endianness at compile time
-ENDIAN := $(shell ./check-endian $(CC))
-
-CFLAGS = -Wall -ggdb -O2
-CFLAGS += -I../include/linux -I../include # for <sdb.h>
-CFLAGS += -ffunction-sections -fdata-sections
-CFLAGS += -Wno-pointer-sign
-CFLAGS += $(ENDIAN) $(LINUXINCLUDE)
-
-
-LIB = libsdbfs.a
-OBJS = glue.o access.o
-
-all: $(LIB)
-
-$(OBJS): $(wildcard *.h)
-
-$(LIB): $(OBJS)
- $(AR) r $@ $(OBJS)
-
-clean:
- rm -f $(OBJS) $(LIB) *~ core
-
-# add the other unused targets, so the rule in ../Makefile works
-modules install modules_install:
+obj-y += glue.o access.o
--
1.7.10.4
patches/barebox/v2014.04/0014-commands-add-sdb-commands-to-list-read-setvar.patch 0 → 100644
View file @ 91c22de9
From 45c70af462edd6fb2cb6962545971a8a3ec78806 Mon Sep 17 00:00:00 2001
From: Alessandro Rubini <rubini@gnudd.com>
Date: Mon, 15 Sep 2014 11:40:59 +0200
Subject: [PATCH 14/14] commands: add sdb commands to list, read, setvar
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
---
commands/Kconfig | 7 ++
commands/Makefile | 1 +
commands/sdb.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 228 insertions(+)
create mode 100644 commands/sdb.c
diff --git a/commands/Kconfig b/commands/Kconfig
index 352e8bf..89cadec 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -756,6 +756,13 @@ config CMD_DETECT
actual probe of the client devices until they are needed. Use the
'detect' command on the physical device to trigger probing.
+config CMD_SDB
+ bool
+ select LIBSDB
+ prompt "commands for reading SDB information"
+ help
+ This enables "sdbinfo", "sdbset" and "sdbread".
+
menuconfig CMD_WD
bool
depends on WATCHDOG
diff --git a/commands/Makefile b/commands/Makefile
index 91ec0e9..e97291e 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -91,6 +91,7 @@ obj-$(CONFIG_CMD_FILETYPE) += filetype.o
obj-$(CONFIG_CMD_BAREBOX_UPDATE)+= barebox-update.o
obj-$(CONFIG_CMD_MIITOOL) += miitool.o
obj-$(CONFIG_CMD_DETECT) += detect.o
+obj-$(CONFIG_CMD_SDB) += sdb.o
obj-$(CONFIG_CMD_BOOT) += boot.o
obj-$(CONFIG_CMD_DEVINFO) += devinfo.o
obj-$(CONFIG_CMD_READF) += readf.o
diff --git a/commands/sdb.c b/commands/sdb.c
new file mode 100644
index 0000000..6b8e358
--- /dev/null
+++ b/commands/sdb.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2014 CERN.
+ * Author: Alessandro Rubini for BE-CO-HT (White Rabbit project)
+ *
+ * Please use according to GNU GPL 2 or later
+ */
+#include <common.h>
+#include <command.h>
+#include <init.h>
+#include <malloc.h>
+#include <errno.h>
+#include <fs.h>
+#include <fcntl.h>
+#include <xfuncs.h>
+#include <environment.h>
+
+#include <../lib/sdb/libsdbfs.h> /* hackish */
+
+#define BUFSIZE 1024 /* like cat.c in this directory */
+
+/* This is the drvdata in the SDB information */
+struct bb_sdb_drvdata {
+ int fd;
+};
+
+static struct bb_sdb_drvdata drvdata;
+
+/* and how to read the thing: use straight barebox POSIX interface */
+static int bb_sdb_read(struct sdbfs *fs, int offset, void *buf, int count)
+{
+ struct bb_sdb_drvdata *dd = fs->drvdata;
+ int fd = dd->fd;
+
+ if (lseek(fd, offset, SEEK_SET) < 0)
+ return -1;
+ return read(fd, buf, count);
+}
+
+static struct sdbfs bb_sdb_instance = {
+ .drvdata = &drvdata,
+ .entrypoint = 0, /* unfortunately: to be fixed */
+ .read = bb_sdb_read,
+};
+
+/* local helpers to open and close, we do it three times on static data */
+static int bb_sdb_create(char *name)
+{
+ int fd, ret;
+ fd = open(name, O_RDONLY);
+
+ if (fd < 0) {
+ printf("could not open %s: %s\n", name, errno_str());
+ return fd;
+ }
+ drvdata.fd = fd;
+ ret = sdbfs_dev_create(&bb_sdb_instance, 1 /* verbose */);
+ if (ret != 0) {
+ printf("Error accessing SDB filesystem in \"%s\"\n",
+ name);
+ }
+ return ret;
+}
+
+static int bb_sdb_destroy(void)
+{
+ return sdbfs_dev_destroy(&bb_sdb_instance);
+}
+
+/* And finally the real commands */
+static int do_sdbinfo(int argc, char *argv[])
+{
+ struct sdb_device *d;
+ struct sdb_product *p;
+ struct sdb_component *c;
+ int new;
+
+ if (argc != 2) {
+ perror("sdbinfo");
+ return 1;
+ }
+ if (bb_sdb_create(argv[1]) != 0)
+ return 1;
+ /* now we already identified the magic number and so on */
+
+ new = 1;
+ while ( (d = sdbfs_scan(&bb_sdb_instance, new)) != NULL) {
+ new = 0; /* for next time */
+
+ c = &d->sdb_component;
+ p = &c->product;
+
+ printf("%016llx:%08x @ %08llx-%08llx ",
+ ntohll(p->vendor_id), ntohl(p->device_id),
+ ntohll(c->addr_first), ntohll(c->addr_last));
+ printf("%.19s\n", p->name);
+ }
+ return bb_sdb_destroy();
+}
+
+static int do_sdbset(int argc, char *argv[])
+{
+ char *buf;
+ char *filename;
+ int i, j, err = 1;
+
+ if (argc < 3 || argc > 4) {
+ perror("sdbset");
+ return 1;
+ }
+ if (bb_sdb_create(argv[1]) != 0)
+ return 1;
+ /* now we already identified the magic number and so on */
+
+ filename = argv[argc - 1];
+ i = sdbfs_open_name(&bb_sdb_instance, filename);
+ if (i < 0) {
+ printf("can't open \"%s\" in \"%s\"\n", filename, argv[1]);
+ goto out;
+ }
+ buf = xmalloc(BUFSIZE);
+ i = sdbfs_fread(&bb_sdb_instance, -1, buf, BUFSIZE);
+ sdbfs_close(&bb_sdb_instance);
+
+ if (i > 0) {
+ j = i - 1;
+ /* trim trailing garbage as the file is assumed to be text */
+ while (j && (buf[j] == 0xff || buf[j] == 0x00))
+ j--;
+ }
+ if (i > 0 && buf[i - 1] == '\n')
+ i--; /* remove trailing newline too */
+ if (i > 0) {
+ buf[i] = '\0';
+ setenv(argv[2], buf);
+ }
+ free(buf);
+ sdbfs_close(&bb_sdb_instance);
+ err = 0;
+out:
+ bb_sdb_destroy();
+ return err;
+}
+
+/*
+ * Read a file, skipping trailing 0x00 or 0xff bytes, as a convenience.
+ * The function is based on local command cat, in this director (Sascha Hauer)
+ */
+static int do_sdbread(int argc, char *argv[])
+{
+ char *buf;
+ int i, j, err = 1;
+
+ if (argc != 3) {
+ perror("sdbread");
+ return 1;
+ }
+
+ if (bb_sdb_create(argv[1]) != 0)
+ return 1;
+ /* now we already identified the magic number and so on */
+
+ i = sdbfs_open_name(&bb_sdb_instance, argv[2]);
+ if (i < 0) {
+ printf("can't open \"%s\" in \"%s\"\n", argv[2], argv[1]);
+ goto out;
+ }
+ buf = xmalloc(BUFSIZE);
+
+ while ( (i = sdbfs_fread(&bb_sdb_instance, -1, buf, BUFSIZE)) > 0) {
+
+ /* trim trailing garbage as the file is assumed to be text */
+ j = i - 1;
+ while (j > 0 && (buf[j] == 0xff || buf[j] == 0x00))
+ j--;
+ for (i = 0; i <= j; i++)
+ putchar(buf[i]);
+ /* no ctrl-C support; this is expected to be fast */
+ }
+ /* most files have the trailing newline alrady, avoid adding it */
+ free(buf);
+ sdbfs_close(&bb_sdb_instance);
+ err = 0;
+out:
+ bb_sdb_destroy();
+ return err;
+}
+
+static const __maybe_unused char cmd_sdbinfo_help[] =
+"Usage: sdbinfo <dev>"
+"\n"
+"List SDB files inside <dev>. Currently entry point must be zero";
+
+BAREBOX_CMD_START(sdbinfo)
+ .cmd = do_sdbinfo,
+ .usage = "sdb information in device",
+ BAREBOX_CMD_HELP(cmd_sdbinfo_help)
+BAREBOX_CMD_END
+
+static const __maybe_unused char cmd_sdbset_help[] =
+"Usage: sdbset <dev> <varname> [<sdbfile>]"
+"\n"
+"Set a variable from the content of an SDB file in <dev>\n";
+
+BAREBOX_CMD_START(sdbset)
+ .cmd = do_sdbset,
+ .usage = "set a variable from an SDB file",
+ BAREBOX_CMD_HELP(cmd_sdbset_help)
+BAREBOX_CMD_END
+
+static const __maybe_unused char cmd_sdbread_help[] =
+"Usage: sdbread <dev> <file>"
+"\n"
+"Print contents of file to stdout\n";
+
+BAREBOX_CMD_START(sdbread)
+ .cmd = do_sdbread,
+ .usage = "cat an SDB file",
+ BAREBOX_CMD_HELP(cmd_sdbread_help)
+BAREBOX_CMD_END
+
--
1.7.10.4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment