diff options
| author | Jeroen Hofstee <jeroen@myspectrum.nl> | 2014-06-12 22:27:12 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-19 11:19:04 -0400 |
| commit | 2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167 (patch) | |
| tree | f5467f0acbb6409a579f287b3ad814469afc7cf3 /common | |
| parent | 967a99ad823342510857be84f7920a41f1949147 (diff) | |
| download | blackbird-obmc-uboot-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.tar.gz blackbird-obmc-uboot-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.zip | |
includes: move openssl headers to include/u-boot
commit 18b06652cd "tools: include u-boot version of sha256.h"
unconditionally forced the sha256.h from u-boot to be used
for tools instead of the host version. This is fragile though
as it will also include the host version. Therefore move it
to include/u-boot to join u-boot/md5.h etc which were renamed
for the same reason.
cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_sha1sum.c | 2 | ||||
| -rw-r--r-- | common/hash.c | 4 | ||||
| -rw-r--r-- | common/image-fit.c | 4 | ||||
| -rw-r--r-- | common/image-sig.c | 4 | ||||
| -rw-r--r-- | common/image.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_sha1sum.c b/common/cmd_sha1sum.c index 644b9a0e66..783ea2e32d 100644 --- a/common/cmd_sha1sum.c +++ b/common/cmd_sha1sum.c @@ -11,7 +11,7 @@ #include <common.h> #include <command.h> #include <hash.h> -#include <sha1.h> +#include <u-boot/sha1.h> int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { diff --git a/common/hash.c b/common/hash.c index 3d953784af..12d67594ab 100644 --- a/common/hash.c +++ b/common/hash.c @@ -15,8 +15,8 @@ #include <malloc.h> #include <hw_sha.h> #include <hash.h> -#include <sha1.h> -#include <sha256.h> +#include <u-boot/sha1.h> +#include <u-boot/sha256.h> #include <asm/io.h> #include <asm/errno.h> diff --git a/common/image-fit.c b/common/image-fit.c index 3311343be6..c61be65133 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -21,10 +21,10 @@ DECLARE_GLOBAL_DATA_PTR; #endif /* !USE_HOSTCC*/ #include <bootstage.h> -#include <sha1.h> -#include <sha256.h> #include <u-boot/crc.h> #include <u-boot/md5.h> +#include <u-boot/sha1.h> +#include <u-boot/sha256.h> /*****************************************************************************/ /* New uImage format routines */ diff --git a/common/image-sig.c b/common/image-sig.c index 48788f9100..8601edaca3 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -13,8 +13,8 @@ DECLARE_GLOBAL_DATA_PTR; #endif /* !USE_HOSTCC*/ #include <image.h> -#include <rsa.h> -#include <rsa-checksum.h> +#include <u-boot/rsa.h> +#include <u-boot/rsa-checksum.h> #define IMAGE_MAX_HASHED_NODES 100 diff --git a/common/image.c b/common/image.c index 828b0af6d2..11b3cf58e6 100644 --- a/common/image.c +++ b/common/image.c @@ -34,7 +34,7 @@ #endif #include <u-boot/md5.h> -#include <sha1.h> +#include <u-boot/sha1.h> #include <asm/errno.h> #include <asm/io.h> |
