summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJeroen Hofstee <jeroen@myspectrum.nl>2014-06-12 22:27:12 +0200
committerTom Rini <trini@ti.com>2014-06-19 11:19:04 -0400
commit2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167 (patch)
treef5467f0acbb6409a579f287b3ad814469afc7cf3 /common
parent967a99ad823342510857be84f7920a41f1949147 (diff)
downloadu-boot-imx-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.zip
u-boot-imx-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.tar.gz
u-boot-imx-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.tar.bz2
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.c2
-rw-r--r--common/hash.c4
-rw-r--r--common/image-fit.c4
-rw-r--r--common/image-sig.c4
-rw-r--r--common/image.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/common/cmd_sha1sum.c b/common/cmd_sha1sum.c
index 644b9a0..783ea2e 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 3d95378..12d6759 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 3311343..c61be65 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 48788f9..8601eda 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 828b0af..11b3cf5 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>