update barebox-state to current dt-utils master
which (at least for owhw-v2) fixes the automatic discovery of the bootstate backend EEPROM. I suspect it should now also work without the hardc-de-layout-values.patch on sysmobts-v2 and sysmocom-odu, but that remains to be tested (and thus the patches remain).
This commit is contained in:
parent
6eef6d8fb3
commit
4a8db6dbea
|
@ -1,15 +1,16 @@
|
|||
DESCRIPTION = "barebox state tool (dt)"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
|
||||
PR = "r3"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "\
|
||||
git://git.pengutronix.de/git/tools/dt-utils.git\
|
||||
file://0001-barebox-state-fix-typo.patch\
|
||||
file://0002-barebox-state-add-support-for-uint8-variables.patch\
|
||||
file://hardcode-layout-values.patch\
|
||||
"
|
||||
|
||||
SRC_URI_append_sysmocom-odu = "file://hardcode-layout-values.patch"
|
||||
SRC_URI_append_sysmobts-v2 = "file://hardcode-layout-values.patch"
|
||||
|
||||
PACKAGES =+ "libdt-utils barebox-fdtdump"
|
||||
|
||||
FILES_libdt-utils = "${libdir}/libdt-utils.so.*"
|
||||
|
@ -17,7 +18,7 @@ FILES_barebox-fdtdump = "${bindir}/fdtdump"
|
|||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
SRCREV = "2e87b7e47752380219c1f12b3dcbb5db706936e5"
|
||||
SRCREV = "f0bddb4f82deaf73cf20aeda5bbf64c50a59dd60"
|
||||
|
||||
DEPENDS = "udev"
|
||||
|
||||
|
|
|
@ -1,73 +0,0 @@
|
|||
From cada2ed0b4ca0d467621fa90de304421e17b4869 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Luebbe <jluebbe@debian.org>
|
||||
Date: Sat, 30 May 2015 19:52:55 +0200
|
||||
Subject: [PATCH 2/3] barebox-state: add support for uint8 variables
|
||||
|
||||
Signed-off-by: Jan Luebbe <jluebbe@debian.org>
|
||||
---
|
||||
src/barebox-state.c | 35 +++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
diff --git a/src/barebox-state.c b/src/barebox-state.c
|
||||
index 57305c4..f56275f 100644
|
||||
--- a/src/barebox-state.c
|
||||
+++ b/src/barebox-state.c
|
||||
@@ -81,6 +81,7 @@ struct state_backend {
|
||||
enum state_variable_type {
|
||||
STATE_TYPE_INVALID = 0,
|
||||
STATE_TYPE_ENUM,
|
||||
+ STATE_TYPE_U8,
|
||||
STATE_TYPE_U32,
|
||||
STATE_TYPE_MAC,
|
||||
};
|
||||
@@ -185,6 +186,32 @@ static int state_uint32_import(struct state_variable *sv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static struct state_variable *state_uint8_create(struct state *state,
|
||||
+ const char *name, struct device_node *node)
|
||||
+{
|
||||
+ struct state_uint32 *su32;
|
||||
+ struct param_d *param;
|
||||
+
|
||||
+ su32 = xzalloc(sizeof(*su32));
|
||||
+
|
||||
+ param = dev_add_param_int(&state->dev, name, state_set_dirty,
|
||||
+ NULL, &su32->value, "%u", state);
|
||||
+ if (IS_ERR(param)) {
|
||||
+ free(su32);
|
||||
+ return ERR_CAST(param);
|
||||
+ }
|
||||
+
|
||||
+ su32->param = param;
|
||||
+ su32->var.size = sizeof(uint8_t);
|
||||
+#ifdef __LITTLE_ENDIAN
|
||||
+ su32->var.raw = &su32->value;
|
||||
+#else
|
||||
+ su32->var.raw = &su32->value + 3;
|
||||
+#endif
|
||||
+
|
||||
+ return &su32->var;
|
||||
+}
|
||||
+
|
||||
static struct state_variable *state_uint32_create(struct state *state,
|
||||
const char *name, struct device_node *node)
|
||||
{
|
||||
@@ -395,6 +422,14 @@ out:
|
||||
|
||||
static struct variable_type types[] = {
|
||||
{
|
||||
+ .type = STATE_TYPE_U8,
|
||||
+ .type_name = "uint8",
|
||||
+ .export = state_uint32_export,
|
||||
+ .import = state_uint32_import,
|
||||
+ .create = state_uint8_create,
|
||||
+ .set = state_uint32_set,
|
||||
+ .get = state_uint32_get,
|
||||
+ }, {
|
||||
.type = STATE_TYPE_U32,
|
||||
.type_name = "uint32",
|
||||
.export = state_uint32_export,
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From 4cc63588211df7bf328e55820cfe19b56ea776b6 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Luebbe <jluebbe@debian.org>
|
||||
Date: Sat, 30 May 2015 20:00:10 +0200
|
||||
Subject: [PATCH 3/3] hardcode symocom-odu values
|
||||
|
||||
Signed-off-by: Jan Luebbe <jluebbe@debian.org>
|
||||
---
|
||||
src/barebox-state.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/barebox-state.c b/src/barebox-state.c
|
||||
index f56275f..002ee5c 100644
|
||||
--- a/src/barebox-state.c
|
||||
+++ b/src/barebox-state.c
|
||||
@@ -1738,6 +1738,7 @@ static struct state *state_get(const char *name)
|
||||
return ERR_CAST(state);
|
||||
}
|
||||
|
||||
+#if 0
|
||||
partition_node = of_parse_phandle(node, "backend", 0);
|
||||
if (!partition_node) {
|
||||
fprintf(stderr, "cannot find backend node in %s\n", node->full_name);
|
||||
@@ -1750,9 +1751,14 @@ static struct state *state_get(const char *name)
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
+#endif
|
||||
+ devpath = "/sys/bus/i2c/devices/1-0050/eeprom";
|
||||
+ offset = 0xc0;
|
||||
+ size = 0x40;
|
||||
+
|
||||
of_property_read_string(node, "backend-type", &backend_type);
|
||||
if (!strcmp(backend_type, "raw"))
|
||||
- ret = state_backend_raw_file(state, partition_node->full_name, devpath, offset, size);
|
||||
+ ret = state_backend_raw_file(state, "/i2c/eeprom@50/partition@0", devpath, offset, size);
|
||||
else
|
||||
fprintf(stderr, "invalid backend type: %s\n", backend_type);
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
Loading…
Reference in New Issue