projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: socfpga: stratix10: Add alias for gmac0 in S10 dts
[oweals/u-boot.git]
/
cmd
/
ximg.c
diff --git
a/cmd/ximg.c
b/cmd/ximg.c
index 8572a67a0063e224bf5381dd66ddcc61b49836ce..a9481004f0369ebf95ebf4b6ee9f6fd25b806f9d 100644
(file)
--- a/
cmd/ximg.c
+++ b/
cmd/ximg.c
@@
-13,6
+13,8
@@
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
+#include <gzip.h>
#include <image.h>
#include <mapmem.h>
#include <watchdog.h>
#include <image.h>
#include <mapmem.h>
#include <watchdog.h>
@@
-35,7
+37,7
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
ulong data, len;
int verify;
int part = 0;
ulong data, len;
int verify;
int part = 0;
-#if defined(CONFIG_
IMAGE_FORMAT_LEGACY
)
+#if defined(CONFIG_
LEGACY_IMAGE_FORMAT
)
ulong count;
image_header_t *hdr = NULL;
#endif
ulong count;
image_header_t *hdr = NULL;
#endif
@@
-67,7
+69,7
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
}
switch (genimg_get_format((void *)addr)) {
}
switch (genimg_get_format((void *)addr)) {
-#if defined(CONFIG_
IMAGE_FORMAT_LEGACY
)
+#if defined(CONFIG_
LEGACY_IMAGE_FORMAT
)
case IMAGE_FORMAT_LEGACY:
printf("## Copying part %d from legacy image "
case IMAGE_FORMAT_LEGACY:
printf("## Copying part %d from legacy image "
@@
-159,9
+161,9
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
}
}
}
}
- /* get subimage data address and length */
- if (fit_image_get_data(fit_hdr, noffset,
- &fit_data, &fit_len)) {
+ /* get subimage
/external
data address and length */
+ if (fit_image_get_data
_and_size
(fit_hdr, noffset,
+
&fit_data, &fit_len)) {
puts("Could not find script subimage data\n");
return 1;
}
puts("Could not find script subimage data\n");
return 1;
}
@@
-217,7
+219,7
@@
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
}
break;
#endif
}
break;
#endif
-#if defined(CONFIG_BZIP2) && defined(CONFIG_
IMAGE_FORMAT_LEGACY
)
+#if defined(CONFIG_BZIP2) && defined(CONFIG_
LEGACY_IMAGE_FORMAT
)
case IH_COMP_BZIP2:
{
int i;
case IH_COMP_BZIP2:
{
int i;