summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2014-04-20 10:34:15 +0200
committerTom Rini <trini@ti.com>2014-05-12 15:19:46 -0400
commit822ef00e989f1b99d8f0554d74fa0d97ce007f06 (patch)
treefc5f093920d8a7b5f50f192d45cc9a398bbb5e8c
parent65bb6d8deebf608ac2bd6c3eb60ad81cf5d30f60 (diff)
downloadu-boot-imx-822ef00e989f1b99d8f0554d74fa0d97ce007f06.zip
u-boot-imx-822ef00e989f1b99d8f0554d74fa0d97ce007f06.tar.gz
u-boot-imx-822ef00e989f1b99d8f0554d74fa0d97ce007f06.tar.bz2
lib/sha256: fix compile on some hosts
Commit 2842c1c24269a05142802d25520e7cb9035e456c introduced lib/sha256 into mkimage. Since then it will be compiled with HOSTCC which may produce errors on some systems. Most BSD systems (like OS X for me) do not ship a linux/string.h which will lead to take the U-Boot provided include/linux/string.h in the end. This header howver is completely wrong here. Just take the string.h if compiling with HOSTCC and linux/string.h when not. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Cc: Heiko Schocher <hs@denx.de> Acked-by: Heiko Schocher<hs@denx.de>
-rw-r--r--lib/sha256.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sha256.c b/lib/sha256.c
index 3212bab..b1085ea 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -8,9 +8,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 <sha256.h>
/*