From: Dirk Behme <dirk.behme@googlemail.com>
Date: Tue, 9 Aug 2011 07:52:57 +0000 (+0000)
Subject: mkimage: Fix 'Unknown OMAP image type - 5'
X-Git-Tag: v2011.09-rc1~68^2~112
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8fcf5959a8dcd92ef01d5e909a5c14581488df93;p=u-boot

mkimage: Fix 'Unknown OMAP image type - 5'

Using mkimage with e.g.

tools/mkimage -A arm -T firmware -O u-boot -d u-boot.bin foo.img

gives a warning

"Unknown OMAP image type - 5"

while it seems that the image itself is created successfully.

This does come from the patch "mkimage: Add OMAP boot image support".

The method check_image_type in image_type_params is supposed to just
return success or failure.  However, for omap it also calls fprintf:

static int omapimage_check_image_types(uint8_t type)
{
	if (type == IH_TYPE_OMAPIMAGE)
		return EXIT_SUCCESS;
	else {
		fprintf(stderr, "Unknown OMAP image type - %x", type);
		return EXIT_FAILURE;
	}
}

All the other image checkers and no others have this, so the fix is to
simply remove the fprintf.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: John Rigby <john.rigby@linaro.org>
CC: Aneesh V <aneesh@ti.com>
CC: Sandeep Paulraj <s-paulraj@ti.com>
---

diff --git a/tools/omapimage.c b/tools/omapimage.c
index 29d91cc69c..5e739ac647 100644
--- a/tools/omapimage.c
+++ b/tools/omapimage.c
@@ -49,7 +49,6 @@ static int omapimage_check_image_types(uint8_t type)
 	if (type == IH_TYPE_OMAPIMAGE)
 		return EXIT_SUCCESS;
 	else {
-		fprintf(stderr, "Unknown OMAP image type - %x", type);
 		return EXIT_FAILURE;
 	}
 }