diff options
| author | Andy Fleming <afleming@freescale.com> | 2008-04-02 16:19:07 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-13 17:02:51 -0700 |
| commit | 20a14a42a25f72e379f38460b8a8484667536795 (patch) | |
| tree | 08adb44b3f45c5c44dee6f1ae7fdef1f70072fe8 | |
| parent | f297b7a1ec87433f66320d89d993e1bc738c66b8 (diff) | |
| download | u-boot-imx-20a14a42a25f72e379f38460b8a8484667536795.zip u-boot-imx-20a14a42a25f72e379f38460b8a8484667536795.tar.gz u-boot-imx-20a14a42a25f72e379f38460b8a8484667536795.tar.bz2 | |
Rename include/md5.h to include/u-boot/md5.h
Some systems have md5.h installed in /usr/include/. This isn't the
desired file (we want the one in include/md5.h). This will avoid the
conflict. This fixes the host tools building problem by creating a new
directory for U-Boot specific header files.
[Patch by Andy Fleming, modified to use separate directory by Wolfgang
Denk]
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Acked-by: Timur Tabi <timur@freescale.com>
| -rw-r--r-- | common/image.c | 4 | ||||
| -rw-r--r-- | include/u-boot/md5.h | 23 | ||||
| -rw-r--r-- | lib_generic/md5.c | 2 |
3 files changed, 26 insertions, 3 deletions
diff --git a/common/image.c b/common/image.c index ce49bb2..9e63432 100644 --- a/common/image.c +++ b/common/image.c @@ -53,7 +53,7 @@ #endif #if defined(CONFIG_FIT) -#include <md5.h> +#include <u-boot/md5.h> #include <sha1.h> static int fit_check_ramdisk (const void *fit, int os_noffset, @@ -70,7 +70,7 @@ static image_header_t* image_get_ramdisk (ulong rd_addr, uint8_t arch, int verify); #else #include "mkimage.h" -#include <md5.h> +#include <u-boot/md5.h> #include <time.h> #include <image.h> #endif /* !USE_HOSTCC*/ diff --git a/include/u-boot/md5.h b/include/u-boot/md5.h new file mode 100644 index 0000000..046d1ee --- /dev/null +++ b/include/u-boot/md5.h @@ -0,0 +1,23 @@ +/* + * This file was transplanted with slight modifications from Linux sources + * (fs/cifs/md5.h) into U-Boot by Bartlomiej Sieka <tur@semihalf.com>. + */ + +#ifndef _MD5_H +#define _MD5_H + +#include <linux/types.h> + +struct MD5Context { + __u32 buf[4]; + __u32 bits[2]; + unsigned char in[64]; +}; + +/* + * Calculate and store in 'output' the MD5 digest of 'len' bytes at + * 'input'. 'output' must have enough space to hold 16 bytes. + */ +void md5 (unsigned char *input, int len, unsigned char output[16]); + +#endif /* _MD5_H */ diff --git a/lib_generic/md5.c b/lib_generic/md5.c index a51da45..3cee431 100644 --- a/lib_generic/md5.c +++ b/lib_generic/md5.c @@ -27,7 +27,7 @@ #include <linux/types.h> #include <linux/string.h> -#include <md5.h> +#include <u-boot/md5.h> static void MD5Transform(__u32 buf[4], __u32 const in[16]); |