[U-Boot] [PATCH] 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 ---
lib/sha256.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
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>
/*
Hi Andreas,
On 04/20/2014 04:34 PM, Andreas Bießmann wrote:
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
s/howver/however
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
lib/sha256.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
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>
/*
Best Regards, Bo Shen
Hello Andreas,
Am 20.04.2014 10:34, schrieb Andreas Bießmann:
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ßmannandreas.devel@googlemail.com Cc: Heiko Schocherhs@denx.de
lib/sha256.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Thanks!
Acked-by: Heiko Schocherhs@denx.de
bye, Heiko
On Sun, Apr 20, 2014 at 10:34:15AM +0200, Andreas Bießmann wrote:
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 Schocherhs@denx.de
Applied to u-boot/master, thanks!
participants (4)
-
Andreas Bießmann -
Bo Shen -
Heiko Schocher -
Tom Rini