From 338cc038461a6c7709c5b86fd9a240209338a1ae Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Fri, 6 Jun 2008 14:28:14 +0200
Subject: tools/mkimage: fix compiler warnings on some systems.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 lib_generic/sha1.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib_generic/sha1.c')

diff --git a/lib_generic/sha1.c b/lib_generic/sha1.c
index c8ef4d2..a192e5f 100644
--- a/lib_generic/sha1.c
+++ b/lib_generic/sha1.c
@@ -31,6 +31,8 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#else
+#include <string.h>
 #endif /* USE_HOSTCC */
 #include <watchdog.h>
 #include <linux/string.h>
-- 
cgit v1.1


From a94f22f08f280905926219e568568964cb9eeb9d Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@freescale.com>
Date: Wed, 11 Jun 2008 18:10:20 -0500
Subject: Fix build issue with string.h and linux/string.h

This commit:
commit 338cc038461a6c7709c5b86fd9a240209338a1ae
Author: Wolfgang Denk <wd@denx.de>
Date:   Fri Jun 6 14:28:14 2008 +0200

    tools/mkimage: fix compiler warnings on some systems.

Broke building on some systems, because the host's string.h was interfering
with u-boot's linux/string.h.  It doesn't look like we need the u-boot one if
we're building for the host, so now we only include when building inside
u-boot.

Signed-off-by: Andy Fleming <afleming@freescale.com>
---
 lib_generic/sha1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib_generic/sha1.c')

diff --git a/lib_generic/sha1.c b/lib_generic/sha1.c
index a192e5f..da5bc16 100644
--- a/lib_generic/sha1.c
+++ b/lib_generic/sha1.c
@@ -31,11 +31,11 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#include <linux/string.h>
 #else
 #include <string.h>
 #endif /* USE_HOSTCC */
 #include <watchdog.h>
-#include <linux/string.h>
 #include "sha1.h"
 
 /*
-- 
cgit v1.1