1 Fix header clash with system /usr/include/sha1.h and sha256.h when libmd
4 Backport of u-boot commit "includes: move openssl headers to include/u-boot"
5 https://github.com/u-boot/u-boot/commit/2b9912e6a7df7b1f60beb7942bd0e6fa5f9d0167
7 --- a/board/gdsys/p1022/controlcenterd-id.c
8 +++ b/board/gdsys/p1022/controlcenterd-id.c
14 +#include <u-boot/sha1.h>
15 #include <asm/byteorder.h>
16 #include <asm/unaligned.h>
18 --- a/board/pcs440ep/pcs440ep.c
19 +++ b/board/pcs440ep/pcs440ep.c
21 #include <asm/processor.h>
22 #include <spd_sdram.h>
23 #include <status_led.h>
25 +#include <u-boot/sha1.h>
29 --- a/common/cmd_sha1sum.c
30 +++ b/common/cmd_sha1sum.c
36 +#include <u-boot/sha1.h>
38 int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
48 +#include <u-boot/sha1.h>
49 +#include <u-boot/sha256.h>
51 #include <asm/errno.h>
53 --- a/common/image-fit.c
54 +++ b/common/image-fit.c
55 @@ -21,7 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
56 #endif /* !USE_HOSTCC*/
58 #include <bootstage.h>
60 +#include <u-boot/sha1.h>
61 #include <u-boot/crc.h>
62 #include <u-boot/md5.h>
69 #include <u-boot/md5.h>
71 +#include <u-boot/sha1.h>
72 #include <asm/errno.h>
75 --- a/drivers/crypto/ace_sha.c
76 +++ b/drivers/crypto/ace_sha.c
78 * SPDX-License-Identifier: GPL-2.0+
83 +#include <u-boot/sha256.h>
84 +#include <u-boot/sha1.h>
85 #include <asm/errno.h>
89 +++ b/include/u-boot/sha1.h
93 +++ b/include/u-boot/sha256.h
95 +#include "../sha256.h"
96 --- a/lib/rsa/rsa-verify.c
97 +++ b/lib/rsa/rsa-verify.c
103 +#include <u-boot/sha1.h>
104 #include <asm/byteorder.h>
105 #include <asm/errno.h>
106 #include <asm/unaligned.h>
111 #endif /* USE_HOSTCC */
112 #include <watchdog.h>
114 +#include <u-boot/sha1.h>
117 * 32-bit integer manipulation macros (big endian)
121 #endif /* USE_HOSTCC */
122 #include <watchdog.h>
123 #include <linux/string.h>
125 +#include <u-boot/sha256.h>
128 * 32-bit integer manipulation macros (big endian)
136 +#include <u-boot/sha1.h>
138 #include <asm/unaligned.h>
140 --- a/tools/imls/imls.c
141 +++ b/tools/imls/imls.c
143 #include <mtd/mtd-user.h>
147 +#include <u-boot/sha1.h>
149 #include <fdt_support.h>
151 --- a/tools/mkimage.h
152 +++ b/tools/mkimage.h
154 #include <sys/stat.h>
158 +#include <u-boot/sha1.h>
159 #include "fdt_host.h"
167 #include <sys/stat.h>
169 +#include <u-boot/sha1.h>
171 int main (int argc, char **argv)