allow partitions without image

useful to generate partition table entries

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

2 files changed, 20 insertions, 10 deletions

diff --git a/genimage.c b/genimage.c
index 5e2eef6..03b84f4 100644
--- a/genimage.c
+++ b/genimage.c
@@ -148,6 +148,8 @@ static int image_generate(struct image *image)
 
 	list_for_each_entry(part, &image->partitions, list) {
 		struct image *child;
+		if (!part->image)
+			continue;
 		child = image_get(part->image);
 		if (!child) {
 			image_error(image, "could not find %s\n", part->image);
@@ -498,6 +500,8 @@ int main(int argc, char *argv[])
 			struct image *i;
 
 			if (!part->image) {
+				if (part->in_partition_table)
+					continue;
 				image_error(image, "no input file given\n");
 				goto err_out;
 			}
diff --git a/image-hd.c b/image-hd.c
index b0cb4ac..4a314a3 100644
--- a/image-hd.c
+++ b/image-hd.c
@@ -152,15 +152,13 @@ static int hdimage_generate(struct image *image)
 		struct image *child;
 		const char *infile;
 
-		child = image_get(part->image);
-		infile = imageoutfile(child);
-
 		ret = pad_file(NULL, outfile, part->offset, 0x0, mode);
 		if (ret) {
 			image_error(image, "failed to pad image to size %lld\n",
 					part->offset);
 			return ret;
 		}
+		mode = MODE_APPEND;
 
 		if (part->extended) {
 			char ebr[4*sizeof(struct partition_entry)+2];
@@ -174,6 +172,12 @@ static int hdimage_generate(struct image *image)
 			}
 		}
 
+		if (!part->image)
+			continue;
+
+		child = image_get(part->image);
+		infile = imageoutfile(child);
+
 		ret = pad_file(infile, outfile, part->size, 0x0, MODE_APPEND);
 
 		if (ret) {
@@ -181,7 +185,6 @@ static int hdimage_generate(struct image *image)
 					part->name);
 			return ret;
 		}
-		mode = MODE_APPEND;
 	}
 
 	if (hd->partition_table) {
@@ -231,13 +234,16 @@ static int hdimage_setup(struct image *image, cfg_t *cfg)
 	has_extended = partition_table_entries > 4;
 	partition_table_entries = 0;
 	list_for_each_entry(part, &image->partitions, list) {
-		struct image *child = image_get(part->image);
-		if (!child) {
-			image_error(image, "could not find %s\n", part->image);
-			return -EINVAL;
+		if (part->image) {
+			struct image *child = image_get(part->image);
+			if (!child) {
+				image_error(image, "could not find %s\n",
+						part->image);
+				return -EINVAL;
+			}
+			if (!part->size)
+				part->size = roundup(child->size, hd->align);
 		}
-		if (!part->size)
-			part->size = roundup(child->size, hd->align);
 		if (!part->size) {
 			image_error(image, "part %s size must not be zero\n",
 					part->name);