[PATCH 2/8] FIT: Do not pre-open images

Sascha Hauer s.hauer at pengutronix.de
Wed Jan 31 03:11:10 PST 2018


Only do what fit_open_configuration() suggests: open the configuration,
but not the images in it.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 common/image-fit.c  | 21 ---------------------
 include/image-fit.h |  7 -------
 2 files changed, 28 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index 12379a67ff..8715689cfb 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -581,27 +581,6 @@ int fit_open_configuration(struct fit_handle *handle, const char *name)
 
 	handle->conf_node = conf_node;
 
-	if (fit_has_image(handle, "kernel")) {
-		ret = fit_open_image(handle, "kernel", &handle->kernel,
-				     &handle->kernel_size);
-		if (ret)
-			return ret;
-	}
-
-	if (fit_has_image(handle, "ramdisk")) {
-		ret = fit_open_image(handle, "ramdisk", &handle->initrd,
-				     &handle->initrd_size);
-		if (ret)
-			return ret;
-	}
-
-	if (fit_has_image(handle, "fdt")) {
-		ret = fit_open_image(handle, "fdt", &handle->oftree,
-				     &handle->oftree_size);
-		if (ret)
-			return ret;
-	}
-
 	return 0;
 }
 
diff --git a/include/image-fit.h b/include/image-fit.h
index 62f44dcc8d..0e26a40ef7 100644
--- a/include/image-fit.h
+++ b/include/image-fit.h
@@ -30,13 +30,6 @@ struct fit_handle {
 
 	struct device_node *root;
 	struct device_node *conf_node;
-
-	const void *kernel;
-	unsigned long kernel_size;
-	const void *oftree;
-	unsigned long oftree_size;
-	const void *initrd;
-	unsigned long initrd_size;
 };
 
 struct fit_handle *fit_open(const char *filename, bool verbose,
-- 
2.15.1




More information about the barebox mailing list