summaryrefslogtreecommitdiffstats
path: root/include
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 /include
parent967a99ad823342510857be84f7920a41f1949147 (diff)
downloadtalos-obmc-uboot-2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167.tar.gz
talos-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 'include')
-rw-r--r--include/image.h2
-rw-r--r--include/u-boot/rsa-checksum.h (renamed from include/rsa-checksum.h)4
-rw-r--r--include/u-boot/rsa.h (renamed from include/rsa.h)0
-rw-r--r--include/u-boot/sha1.h (renamed from include/sha1.h)0
-rw-r--r--include/u-boot/sha256.h (renamed from include/sha256.h)0
5 files changed, 3 insertions, 3 deletions
diff --git a/include/image.h b/include/image.h
index ab93eb6333..0a072f5336 100644
--- a/include/image.h
+++ b/include/image.h
@@ -886,7 +886,7 @@ struct image_region {
};
#if IMAGE_ENABLE_VERIFY
-# include <rsa-checksum.h>
+# include <u-boot/rsa-checksum.h>
#endif
struct checksum_algo {
const char *name;
diff --git a/include/rsa-checksum.h b/include/u-boot/rsa-checksum.h
index 612db85fe0..c996fb3e4c 100644
--- a/include/rsa-checksum.h
+++ b/include/u-boot/rsa-checksum.h
@@ -9,8 +9,8 @@
#include <errno.h>
#include <image.h>
-#include <sha1.h>
-#include <sha256.h>
+#include <u-boot/sha1.h>
+#include <u-boot/sha256.h>
extern const uint8_t padding_sha256_rsa4096[];
extern const uint8_t padding_sha256_rsa2048[];
diff --git a/include/rsa.h b/include/u-boot/rsa.h
index 325751ab7e..325751ab7e 100644
--- a/include/rsa.h
+++ b/include/u-boot/rsa.h
diff --git a/include/sha1.h b/include/u-boot/sha1.h
index da09dab976..da09dab976 100644
--- a/include/sha1.h
+++ b/include/u-boot/sha1.h
diff --git a/include/sha256.h b/include/u-boot/sha256.h
index beadab35ff..beadab35ff 100644
--- a/include/sha256.h
+++ b/include/u-boot/sha256.h
OpenPOWER on IntegriCloud