diff mbox

[U-Boot,v2] mkimage: Fix 'Unknown OMAP image type - 5'

Message ID 1312912377-12652-1-git-send-email-dirk.behme@gmail.com
State Accepted
Commit 8fcf5959a8dcd92ef01d5e909a5c14581488df93
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Dirk Behme Aug. 9, 2011, 5:52 p.m. UTC 
From: Dirk Behme <dirk.behme@googlemail.com>

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>

---

Changes in v2: Instead of reordering the init sequence, remove
the fprintf().

This is reproducable with the recent mainline mkimage where the
patch "mkimage: Add OMAP boot image support" is applied:

http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commit;h=3decb14abe76d244ba98fd158ef95f89e7e37d70

 tools/omapimage.c |    1 -
 1 file changed, 1 deletion(-)

Comments

Albert ARIBAUD Aug. 20, 2011, 3:32 p.m. UTC | #1 
Hi dirk,

Le 09/08/2011 19:52, Dirk Behme a écrit :
> From: Dirk Behme<dirk.behme@googlemail.com>
>
> 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>
>
> ---

Applied to u-boot-arm/master with Sandeep's agreement, thanks!

Amicalement,
diff mbox

Patch

Index: u-boot.git/tools/omapimage.c
===================================================================
--- u-boot.git.orig/tools/omapimage.c
+++ u-boot.git/tools/omapimage.c
@@ -49,7 +49,6 @@  static int omapimage_check_image_types(u
 	if (type == IH_TYPE_OMAPIMAGE)
 		return EXIT_SUCCESS;
 	else {
-		fprintf(stderr, "Unknown OMAP image type - %x", type);
 		return EXIT_FAILURE;
 	}
 }