Both Fastboot and DFU have their own global variables that allow
specifying the partitions that can be flashed via the environment.
With the upcoming addition of the USB mass storage gadget, we will need
some way to define the partitions there as well.
Instead of adding yet another way download method-specific variable,
add a generic machine.partitions variable that can be specified on a
per-board basis and can be used for all methods.
Existing variables will still remain for backwards-compatibility, but
when unset, it should fall back to this new parameter. This is done
if the follow-up patches.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
common/Kconfig | 11 +++++++++
common/Makefile | 1 +
common/file-list.c | 18 +++++++++++++++
common/machine-partitions.c | 44 ++++++++++++++++++++++++++++++++++++
include/file-list.h | 2 ++
include/machine-partitions.h | 40 ++++++++++++++++++++++++++++++++
include/of.h | 5 ++++
7 files changed, 121 insertions(+)
create mode 100644 common/machine-partitions.c
create mode 100644 include/machine-partitions.h
diff --git a/common/Kconfig b/common/Kconfig
index 2170f985bebc..f9803dbb5219 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -696,6 +696,17 @@ config FLEXIBLE_BOOTARGS
config BAREBOX_UPDATE
bool "In-system barebox update infrastructure"
+config MACHINE_PARTITIONS
+ bool "Generic machine partitions support"
+ depends on OFTREE
+ help
+ Machine partitions are a generic way for boards to specify the
+ partitions of the machine that should be exported for flashing.
+ Board drivers setting this directly will select this option
+ automatically.
+ Say y here if this should be configurable over the
+ machine.partitions device parameter.
+
config IMD
select CRC32
bool "barebox metadata support"
diff --git a/common/Makefile b/common/Makefile
index 0e0ba384c9b5..8d5a3a20b79a 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_MACHINE_ID) += machine_id.o
obj-$(CONFIG_AUTO_COMPLETE) += complete.o
obj-y += version.o
obj-$(CONFIG_BAREBOX_UPDATE) += bbu.o
+obj-$(CONFIG_MACHINE_PARTITIONS) += machine-partitions.o
obj-$(CONFIG_BINFMT) += binfmt.o
obj-$(CONFIG_BLOCK) += block.o
obj-$(CONFIG_BLSPEC) += blspec.o
diff --git a/common/file-list.c b/common/file-list.c
index 924903cef7dc..580423aef72d 100644
--- a/common/file-list.c
+++ b/common/file-list.c
@@ -170,6 +170,24 @@ void file_list_free(struct file_list *files)
free(files);
}
+struct file_list *file_list_dup(struct file_list *old)
+{
+ struct file_list_entry *old_entry;
+ struct file_list *new;
+
+ new = xzalloc(sizeof(*new));
+
+ INIT_LIST_HEAD(&new->list);
+
+ list_for_each_entry(old_entry, &old->list, list) {
+ (void)file_list_add_entry(new, old_entry->name, old_entry->filename,
+ old_entry->flags); /* can't fail */
+ new->num_entries++;
+ }
+
+ return new;
+}
+
char *file_list_to_str(const struct file_list *files)
{
struct file_list_entry *entry;
diff --git a/common/machine-partitions.c b/common/machine-partitions.c
new file mode 100644
index 000000000000..4179dcd1b045
--- /dev/null
+++ b/common/machine-partitions.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021 Ahmad Fatoum, Pengutronix
+ */
+
+#include <file-list.h>
+#include <param.h>
+#include <of.h>
+#include <init.h>
+#include <magicvar.h>
+#include <machine-partitions.h>
+
+static struct file_list *machine_partitions;
+
+bool machine_partitions_empty(void)
+{
+ return file_list_empty(machine_partitions);
+}
+
+struct file_list *machine_partitions_get(void)
+{
+ return file_list_dup(machine_partitions);
+}
+
+void machine_partitions_set(struct file_list *files)
+{
+ file_list_free(machine_partitions);
+ machine_partitions = files;
+}
+
+static int machine_partitions_var_init(void)
+{
+ struct param_d *param;
+
+ machine_partitions = file_list_parse("");
+ param = dev_add_param_file_list(of_get_machine(), "partitions",
+ NULL, NULL, &machine_partitions, NULL);
+
+ return PTR_ERR_OR_ZERO(param);
+}
+postcore_initcall(machine_partitions_var_init);
+
+BAREBOX_MAGICVAR(machine.partitions,
+ "board-specific list of updatable partitions");
diff --git a/include/file-list.h b/include/file-list.h
index 7264a3e2c628..2538883c3659 100644
--- a/include/file-list.h
+++ b/include/file-list.h
@@ -28,6 +28,8 @@ void file_list_free(struct file_list *);
int file_list_add_entry(struct file_list *files, const char *name, const char *filename,
unsigned long flags);
+struct file_list *file_list_dup(struct file_list *old);
+
struct file_list_entry *file_list_entry_by_name(struct file_list *files, const char *name);
#define file_list_for_each_entry(files, entry) \
diff --git a/include/machine-partitions.h b/include/machine-partitions.h
new file mode 100644
index 000000000000..0619a7985bcc
--- /dev/null
+++ b/include/machine-partitions.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef MACHINE_PARTITIONS_H_
+#define MACHINE_PARTITIONS_H_
+
+#include <file-list.h>
+
+#ifdef CONFIG_MACHINE_PARTITIONS
+
+/* duplicates current machine_partitions and returns it */
+struct file_list *machine_partitions_get(void);
+
+/* takes ownership of files and store it internally */
+void machine_partitions_set(struct file_list *files);
+
+/*
+ * check whether machine_partitions_get would return an empty
+ * file_list without doing an allocation
+ */
+bool machine_partitions_empty(void);
+
+#else
+
+static inline struct file_list *machine_partitions_get(void)
+{
+ return file_list_parse("");
+}
+
+static inline bool machine_partitions_empty(void)
+{
+ return true;
+}
+
+/*
+ * machine_partitions_set() intentionally left unimplemented.
+ * select CONFIG_MACHINE_PARTITIONS if you want to set it
+ */
+
+#endif
+
+#endif
diff --git a/include/of.h b/include/of.h
index 645f429bdeed..6bb3d444e4a5 100644
--- a/include/of.h
+++ b/include/of.h
@@ -1066,4 +1066,9 @@ static inline int of_firmware_load_overlay(struct device_node *overlay, const ch
}
#endif
+static inline struct device_d *of_get_machine(void)
+{
+ return of_find_device_by_node(of_get_root_node());
+}
+
#endif /* __OF_H */
--
2.29.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
