From: Yegor Yefremov <yegorslists@xxxxxxxxxxxxxx>
In U-Boot configuration name is passed as a string after
address in bootm comman after '#' separator. In Barebox
a string coming after '@' separator will be converted to
integer.
This patch adds additional field os_conf to the image_data
structure in order to save the string after '@' as is and pass
it to fit_open() routine.
In addition of_node_cmp() had to be reworked in order to support
both short and full node names like U-Boot does. For example:
*.its file has following configurations:
conf214@1 {
description = "Boot Linux kernel with FDT blob (214)";
kernel = "kernel@1";
fdt = "fdt220@1";
};
conf214@2 {
description = "Boot Linux kernel with FDT blob (214@2)";
kernel = "kernel@1";
fdt = "fdt210@1";
};
> bootm /boot/kernel-fit.itb@conf214 - would select "conf214@1"
> bootm /boot/kernel-fit.itb@conf214@2 - would select "conf214@2"
Signed-off-by: Yegor Yefremov <yegorslists@xxxxxxxxxxxxxx>
---
arch/arm/lib/bootm.c | 2 +-
common/bootm.c | 11 +++++++----
common/image-fit.c | 12 ++++++------
drivers/of/base.c | 15 +++++++++++++++
include/boot.h | 3 +++
include/image-fit.h | 2 +-
include/of.h | 2 +-
7 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 9a78ee8..10745a7 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -562,7 +562,7 @@ static int do_bootm_arm_fit(struct image_data *data)
unsigned long mem_free;
unsigned long mem_start, mem_size;
- handle = fit_open(data->os_file, data->os_num, data->verbose);
+ handle = fit_open(data->os_file, data->os_conf, data->verbose);
if (!handle)
return -EINVAL;
diff --git a/common/bootm.c b/common/bootm.c
index 08125e7..c827033 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -351,7 +351,7 @@ static void bootm_print_info(struct image_data *data)
}
}
-static char *bootm_image_name_and_no(const char *name, int *no)
+static char *bootm_image_name_and_no(const char *name, int *no, char **conf)
{
char *at, *ret;
@@ -359,6 +359,7 @@ static char *bootm_image_name_and_no(const char *name, int *no)
return NULL;
*no = 0;
+ *conf = NULL;
ret = xstrdup(name);
at = strchr(ret, '@');
@@ -369,6 +370,8 @@ static char *bootm_image_name_and_no(const char *name, int *no)
*no = simple_strtoul(at, NULL, 10);
+ *conf = xstrdup(at);
+
return ret;
}
@@ -390,9 +393,9 @@ int bootm_boot(struct bootm_data *bootm_data)
data = xzalloc(sizeof(*data));
- data->os_file = bootm_image_name_and_no(bootm_data->os_file, &data->os_num);
- data->oftree_file = bootm_image_name_and_no(bootm_data->oftree_file, &data->oftree_num);
- data->initrd_file = bootm_image_name_and_no(bootm_data->initrd_file, &data->initrd_num);
+ data->os_file = bootm_image_name_and_no(bootm_data->os_file, &data->os_num, &data->os_conf);
+ data->oftree_file = bootm_image_name_and_no(bootm_data->oftree_file, &data->oftree_num, &data->os_conf);
+ data->initrd_file = bootm_image_name_and_no(bootm_data->initrd_file, &data->initrd_num, &data->os_conf);
data->verbose = bootm_data->verbose;
data->verify = bootm_data->verify;
data->force = bootm_data->force;
diff --git a/common/image-fit.c b/common/image-fit.c
index f943081..490974d 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -451,7 +451,7 @@ static int fit_open_image(struct fit_handle *handle, const char* unit)
return level;
}
-static int fit_open_configuration(struct fit_handle *handle, int num)
+static int fit_open_configuration(struct fit_handle *handle, const char *conf)
{
struct device_node *conf_node = NULL, *sig_node;
char unit_name[10];
@@ -462,8 +462,8 @@ static int fit_open_configuration(struct fit_handle *handle, int num)
if (!conf_node)
return -ENOENT;
- if (num) {
- snprintf(unit_name, sizeof(unit_name), "conf@%d", num);
+ if (conf) {
+ snprintf(unit_name, sizeof(unit_name), "%s", conf);
unit = unit_name;
} else if (of_property_read_string(conf_node, "default", &unit)) {
unit = "conf@1";
@@ -519,7 +519,7 @@ static int fit_open_configuration(struct fit_handle *handle, int num)
return 0;
}
-struct fit_handle *fit_open(const char *filename, int num, bool verbose)
+struct fit_handle *fit_open(const char *filename, const char *conf, bool verbose)
{
struct fit_handle *handle = NULL;
const char *desc;
@@ -545,7 +545,7 @@ struct fit_handle *fit_open(const char *filename, int num, bool verbose)
pr_info("FIT '%s': '%s'\n", filename, desc);
}
- if (fit_open_configuration(handle, num))
+ if (fit_open_configuration(handle, conf))
goto err;
return handle;
@@ -571,7 +571,7 @@ void fit_close(struct fit_handle *handle)
static int do_bootm_sandbox_fit(struct image_data *data)
{
struct fit_handle *handle;
- handle = fit_open(data->os_file, data->os_num, data->verbose);
+ handle = fit_open(data->os_file, data->os_conf, data->verbose);
if (handle)
fit_close(handle);
return 0;
diff --git a/drivers/of/base.c b/drivers/of/base.c
index d12bfe3..e8fa5dc 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -30,6 +30,21 @@
#include <linux/amba/bus.h>
#include <linux/err.h>
+int of_node_cmp(const char *s1, const char *s2)
+{
+ int len = strlen(s2);
+
+ if (strncasecmp(s1, s2, len) != 0)
+ return 1;
+
+ if (s1[len] == '\0')
+ return 0;
+ else if (!memchr(s2, '@', len) && (s1[len] == '@'))
+ return 0;
+ else
+ return 1;
+}
+
/*
* Iterate over all nodes of a tree. As a devicetree does not
* have a dedicated list head, the start node (usually the root
diff --git a/include/boot.h b/include/boot.h
index bdd5477..6c695b2 100644
--- a/include/boot.h
+++ b/include/boot.h
@@ -30,6 +30,9 @@ struct image_data {
struct uimage_handle *os;
int os_num;
+ /* if we have FIT image, configuration name will be provided */
+ char *os_conf;
+
/* otherwise only the filename will be provided */
char *os_file;
diff --git a/include/image-fit.h b/include/image-fit.h
index bcbc859..671bee8 100644
--- a/include/image-fit.h
+++ b/include/image-fit.h
@@ -36,7 +36,7 @@ struct fit_handle {
unsigned long initrd_size;
};
-struct fit_handle *fit_open(const char *filename, int num, bool verbose);
+struct fit_handle *fit_open(const char *filename, const char *conf, bool verbose);
void fit_close(struct fit_handle *handle);
#endif /* __IMAGE_FIT_H__ */
diff --git a/include/of.h b/include/of.h
index 75cc3c1..3b18eef 100644
--- a/include/of.h
+++ b/include/of.h
@@ -10,7 +10,6 @@
/* Default string compare functions */
#define of_compat_cmp(s1, s2, l) strcasecmp((s1), (s2))
#define of_prop_cmp(s1, s2) strcmp((s1), (s2))
-#define of_node_cmp(s1, s2) strcasecmp((s1), (s2))
#define OF_BAD_ADDR ((u64)-1)
@@ -104,6 +103,7 @@ struct device_node *of_unflatten_dtb(const void *fdt);
struct cdev;
#ifdef CONFIG_OFTREE
+extern int of_node_cmp(const char *s1, const char *s2);
extern int of_n_addr_cells(struct device_node *np);
extern int of_n_size_cells(struct device_node *np);
--
2.1.4
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
