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>
This commit is contained in:
parent
f297b7a1ec
commit
20a14a42a2
|
@ -53,7 +53,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_FIT)
|
#if defined(CONFIG_FIT)
|
||||||
#include <md5.h>
|
#include <u-boot/md5.h>
|
||||||
#include <sha1.h>
|
#include <sha1.h>
|
||||||
|
|
||||||
static int fit_check_ramdisk (const void *fit, int os_noffset,
|
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);
|
int verify);
|
||||||
#else
|
#else
|
||||||
#include "mkimage.h"
|
#include "mkimage.h"
|
||||||
#include <md5.h>
|
#include <u-boot/md5.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <image.h>
|
#include <image.h>
|
||||||
#endif /* !USE_HOSTCC*/
|
#endif /* !USE_HOSTCC*/
|
||||||
|
|
|
@ -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 */
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <md5.h>
|
#include <u-boot/md5.h>
|
||||||
|
|
||||||
static void
|
static void
|
||||||
MD5Transform(__u32 buf[4], __u32 const in[16]);
|
MD5Transform(__u32 buf[4], __u32 const in[16]);
|
||||||
|
|
Loading…
Reference in New Issue