The FIT spec is not very specific and was growing over the past years,
e.g. according U-Boot (doc/usage/fit/source_file_format.rst) either a
"kernel" or "firmware" property is mandatory whereas the fit-overlay
example (doc/usage/fit/overlay-fdt-boot.rst) doesn't fulfil this
requirement. Instead it allows nodes which contain only a "fdt"
property.
This inconsistency makes it hard to detect the purpose of a
configuration node. So far we have three different configuration nodes
- bootable nodes (the usual use-case):
| config-0 {
| compatible = "machine-compatible";
| kernel = "kernel-img-name";
| fdt = "fdt-img-name";
| }
- firmware only nodes like (doc/usage/fit/sec_firmware_ppa.rst):
| config-1 {
| description = "PPA Secure firmware";
| firmware = "firmware@1";
| loadables = "trustedOS@1", "fuse_scr";
| };
- overlay only nodes:
| config-2 {
| fdt = "fdt-overlay-img-name";
| }
This commit adds an optional match function which can be passed to the
fit_open_configuration() to sort out config nodes which are not
interessting, e.g. the bootm code is only interested in config nodes
which do provide a "kernel" image.
This new match function gets called if no explicit configuration node
name was specified.
Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
common/bootm.c | 13 ++++++++++++-
common/image-fit.c | 22 ++++++++++++++++------
include/image-fit.h | 4 +++-
3 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/common/bootm.c b/common/bootm.c
index
95211011fe8bf5f52ce3155de419bc9b09ff2228..7f37c74eb41e5c7a89aa4038bae46cee5f056f5f
100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -609,6 +609,16 @@ static int bootm_open_os_uimage(struct image_data *data)
return 0;
}
+static bool bootm_fit_config_valid(struct fit_handle *fit,
+ struct device_node *config)
+{
+ /*
+ * Consider only FIT configurations which do provide a loadable kernel
+ * image.
+ */
+ return !!fit_has_image(fit, config, "kernel");
+}
+
static int bootm_open_fit(struct image_data *data)
{
struct fit_handle *fit;
@@ -634,7 +644,8 @@ static int bootm_open_fit(struct image_data *data)
data->os_fit = fit;
data->fit_config = fit_open_configuration(data->os_fit,
- data->os_part);
+ data->os_part,
+ bootm_fit_config_valid);
if (IS_ERR(data->fit_config)) {
pr_err("Cannot open FIT image configuration '%s'\n",
data->os_part ? data->os_part : "default");
diff --git a/common/image-fit.c b/common/image-fit.c
index
4d5c5bfe12472af85b26cd1ee93e7c99316b283c..0fc3b2e4aa7217a47710ef613426456420e81324
100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -782,7 +782,9 @@ static int fit_fdt_is_compatible(struct fit_handle *handle,
static int fit_find_compatible_unit(struct fit_handle *handle,
struct device_node *conf_node,
- const char **unit)
+ const char **unit,
+ bool (*config_node_valid)(struct fit_handle
*handle,
+ struct
device_node *config))
{
struct device_node *child = NULL;
struct device_node *barebox_root;
@@ -799,7 +801,12 @@ static int fit_find_compatible_unit(struct fit_handle
*handle,
return -ENOENT;
for_each_child_of_node(conf_node, child) {
- int score = of_device_is_compatible(child, machine);
+ int score;
+
+ if (config_node_valid && !config_node_valid(handle, child))
+ continue;
+
+ score = of_device_is_compatible(child, machine);
if (!score)
score = fit_fdt_is_compatible(handle, child, machine);
@@ -857,7 +864,9 @@ static int fit_find_last_unit(struct fit_handle *handle,
* Return: If successful a pointer to a valid configuration node,
* otherwise a ERR_PTR()
*/
-void *fit_open_configuration(struct fit_handle *handle, const char *name)
+void *fit_open_configuration(struct fit_handle *handle, const char *name,
+ bool (*match_valid)(struct fit_handle *handle,
+ struct device_node *config))
{
struct device_node *conf_node = handle->configurations;
const char *unit, *desc = "(no description)";
@@ -869,7 +878,8 @@ void *fit_open_configuration(struct fit_handle *handle,
const char *name)
if (name) {
unit = name;
} else {
- ret = fit_find_compatible_unit(handle, conf_node, &unit);
+ ret = fit_find_compatible_unit(handle, conf_node, &unit,
+ match_valid);
if (ret) {
pr_info("Couldn't get a valid configuration.
Aborting.\n");
return ERR_PTR(ret);
@@ -1044,12 +1054,12 @@ static int fuzz_fit(const u8 *data, size_t size)
if (ret)
goto out;
- config = fit_open_configuration(&handle, NULL);
+ config = fit_open_configuration(&handle, NULL, NULL);
if (IS_ERR(config)) {
ret = fit_find_last_unit(&handle, &unit);
if (ret)
goto out;
- config = fit_open_configuration(&handle, unit);
+ config = fit_open_configuration(&handle, unit, NULL);
}
if (IS_ERR(config)) {
ret = PTR_ERR(config);
diff --git a/include/image-fit.h b/include/image-fit.h
index
0b8e94bf46357a1fe01ef90cd8b0fca0c41641c3..416f1f2c1896949d2bcb7ab1a31f1aa6b5682edf
100644
--- a/include/image-fit.h
+++ b/include/image-fit.h
@@ -26,7 +26,9 @@ struct fit_handle *fit_open(const char *filename, bool
verbose,
enum bootm_verify verify, loff_t max_size);
struct fit_handle *fit_open_buf(const void *buf, size_t len, bool verbose,
enum bootm_verify verify);
-void *fit_open_configuration(struct fit_handle *handle, const char *name);
+void *fit_open_configuration(struct fit_handle *handle, const char *name,
+ bool (*match_valid)(struct fit_handle *handle,
+ struct device_node *config));
int fit_has_image(struct fit_handle *handle, void *configuration,
const char *name);
int fit_open_image(struct fit_handle *handle, void *configuration,
--
2.39.5
