projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash on sequoia in ppc_4xx_eth_init
[oweals/u-boot.git]
/
common
/
image.c
diff --git
a/common/image.c
b/common/image.c
index f04826a5c86d8f5ca0a7c0db8a571a3530b148db..d218f2f88ba77397fd69b24e8e6f17cd9dde1954 100644
(file)
--- a/
common/image.c
+++ b/
common/image.c
@@
-53,7
+53,7
@@
#endif
#if defined(CONFIG_FIT)
#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,
#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"
int verify);
#else
#include "mkimage.h"
-#include <md5.h>
+#include <
u-boot/
md5.h>
#include <time.h>
#include <image.h>
#endif /* !USE_HOSTCC*/
#include <time.h>
#include <image.h>
#endif /* !USE_HOSTCC*/
@@
-983,7
+983,7
@@
int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
#endif /* CONFIG_B2 || CONFIG_EVB4510 || CONFIG_ARMADILLO */
} else if (images->legacy_hdr_valid &&
#endif /* CONFIG_B2 || CONFIG_EVB4510 || CONFIG_ARMADILLO */
} else if (images->legacy_hdr_valid &&
- image_check_type (
images->legacy_hdr_os
, IH_TYPE_MULTI)) {
+ image_check_type (
&images->legacy_hdr_os_copy
, IH_TYPE_MULTI)) {
/*
* Now check if we have a legacy mult-component image,
* get second entry data start address and len.
/*
* Now check if we have a legacy mult-component image,
* get second entry data start address and len.
@@
-1014,7
+1014,7
@@
int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
return 0;
}
return 0;
}
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
|| defined(CONFIG_SPARC)
/**
* boot_ramdisk_high - relocate init ramdisk
* @lmb: pointer to lmb handle, will be used for memory mgmt
/**
* boot_ramdisk_high - relocate init ramdisk
* @lmb: pointer to lmb handle, will be used for memory mgmt