mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-16 09:48:16 +00:00
712fbcf384
This avoids the following checkpatch warning in later patches: ERROR: "(foo*)" should be "(foo *)" ERROR: space required before the open brace '{' ERROR: space prohibited before that close parenthesis ')' ERROR: spaces required around that '||' (ctx:WxV) WARNING: space prohibited between function name and open parenthesis '(' WARNING: line over 80 characters This fixes all the white-space warnings/errors in my subsequent patch, and within this current patch. A number of other checkpatch warnings and errors are still present in this patch itself, but are beyond simple whitespace fixes, so are not solved by this patch. v2: New patch Signed-off-by: Stephen Warren <swarren@nvidia.com> Tested-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
277 lines
6.2 KiB
C
277 lines
6.2 KiB
C
/*
|
|
* (C) Copyright 2000-2004
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
*
|
|
* (C) Copyright 2003
|
|
* Kai-Uwe Bloem, Auerswald GmbH & Co KG, <linux-development@auerswald.de>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
|
|
/*
|
|
* Multi Image extract
|
|
*/
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <image.h>
|
|
#include <watchdog.h>
|
|
#if defined(CONFIG_BZIP2)
|
|
#include <bzlib.h>
|
|
#endif
|
|
#include <asm/byteorder.h>
|
|
|
|
#ifndef CONFIG_SYS_XIMG_LEN
|
|
/* use 8MByte as default max gunzip size */
|
|
#define CONFIG_SYS_XIMG_LEN 0x800000
|
|
#endif
|
|
|
|
int
|
|
do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
ulong addr = load_addr;
|
|
ulong dest = 0;
|
|
ulong data, len, count;
|
|
int verify;
|
|
int part = 0;
|
|
char pbuf[10];
|
|
image_header_t *hdr;
|
|
#if defined(CONFIG_FIT)
|
|
const char *uname = NULL;
|
|
const void* fit_hdr;
|
|
int noffset;
|
|
const void *fit_data;
|
|
size_t fit_len;
|
|
#endif
|
|
uint unc_len = CONFIG_SYS_XIMG_LEN;
|
|
uint8_t comp;
|
|
|
|
verify = getenv_yesno("verify");
|
|
|
|
if (argc > 1) {
|
|
addr = simple_strtoul(argv[1], NULL, 16);
|
|
}
|
|
if (argc > 2) {
|
|
part = simple_strtoul(argv[2], NULL, 16);
|
|
#if defined(CONFIG_FIT)
|
|
uname = argv[2];
|
|
#endif
|
|
}
|
|
if (argc > 3) {
|
|
dest = simple_strtoul(argv[3], NULL, 16);
|
|
}
|
|
|
|
switch (genimg_get_format((void *)addr)) {
|
|
case IMAGE_FORMAT_LEGACY:
|
|
|
|
printf("## Copying part %d from legacy image "
|
|
"at %08lx ...\n", part, addr);
|
|
|
|
hdr = (image_header_t *)addr;
|
|
if (!image_check_magic(hdr)) {
|
|
printf("Bad Magic Number\n");
|
|
return 1;
|
|
}
|
|
|
|
if (!image_check_hcrc(hdr)) {
|
|
printf("Bad Header Checksum\n");
|
|
return 1;
|
|
}
|
|
#ifdef DEBUG
|
|
image_print_contents(hdr);
|
|
#endif
|
|
|
|
if (!image_check_type(hdr, IH_TYPE_MULTI)) {
|
|
printf("Wrong Image Type for %s command\n",
|
|
cmdtp->name);
|
|
return 1;
|
|
}
|
|
|
|
comp = image_get_comp(hdr);
|
|
if ((comp != IH_COMP_NONE) && (argc < 4)) {
|
|
printf("Must specify load address for %s command "
|
|
"with compressed image\n",
|
|
cmdtp->name);
|
|
return 1;
|
|
}
|
|
|
|
if (verify) {
|
|
printf(" Verifying Checksum ... ");
|
|
if (!image_check_dcrc(hdr)) {
|
|
printf("Bad Data CRC\n");
|
|
return 1;
|
|
}
|
|
printf("OK\n");
|
|
}
|
|
|
|
count = image_multi_count(hdr);
|
|
if (part >= count) {
|
|
printf("Bad Image Part\n");
|
|
return 1;
|
|
}
|
|
|
|
image_multi_getimg(hdr, part, &data, &len);
|
|
break;
|
|
#if defined(CONFIG_FIT)
|
|
case IMAGE_FORMAT_FIT:
|
|
if (uname == NULL) {
|
|
puts("No FIT subimage unit name\n");
|
|
return 1;
|
|
}
|
|
|
|
printf("## Copying '%s' subimage from FIT image "
|
|
"at %08lx ...\n", uname, addr);
|
|
|
|
fit_hdr = (const void *)addr;
|
|
if (!fit_check_format(fit_hdr)) {
|
|
puts("Bad FIT image format\n");
|
|
return 1;
|
|
}
|
|
|
|
/* get subimage node offset */
|
|
noffset = fit_image_get_node(fit_hdr, uname);
|
|
if (noffset < 0) {
|
|
printf("Can't find '%s' FIT subimage\n", uname);
|
|
return 1;
|
|
}
|
|
|
|
if (fit_image_check_comp(fit_hdr, noffset, IH_COMP_NONE)
|
|
&& (argc < 4)) {
|
|
printf("Must specify load address for %s command "
|
|
"with compressed image\n",
|
|
cmdtp->name);
|
|
return 1;
|
|
}
|
|
|
|
/* verify integrity */
|
|
if (verify) {
|
|
if (!fit_image_check_hashes(fit_hdr, noffset)) {
|
|
puts("Bad Data Hash\n");
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
/* get subimage data address and length */
|
|
if (fit_image_get_data(fit_hdr, noffset,
|
|
&fit_data, &fit_len)) {
|
|
puts("Could not find script subimage data\n");
|
|
return 1;
|
|
}
|
|
|
|
if (fit_image_get_comp(fit_hdr, noffset, &comp)) {
|
|
puts("Could not find script subimage "
|
|
"compression type\n");
|
|
return 1;
|
|
}
|
|
|
|
data = (ulong)fit_data;
|
|
len = (ulong)fit_len;
|
|
break;
|
|
#endif
|
|
default:
|
|
puts("Invalid image type for imxtract\n");
|
|
return 1;
|
|
}
|
|
|
|
if (argc > 3) {
|
|
switch (comp) {
|
|
case IH_COMP_NONE:
|
|
#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
|
|
{
|
|
size_t l = len;
|
|
size_t tail;
|
|
void *to = (void *) dest;
|
|
void *from = (void *)data;
|
|
|
|
printf(" Loading part %d ... ", part);
|
|
|
|
while (l > 0) {
|
|
tail = (l > CHUNKSZ) ? CHUNKSZ : l;
|
|
WATCHDOG_RESET();
|
|
memmove(to, from, tail);
|
|
to += tail;
|
|
from += tail;
|
|
l -= tail;
|
|
}
|
|
}
|
|
#else /* !(CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG) */
|
|
printf(" Loading part %d ... ", part);
|
|
memmove((char *) dest, (char *)data, len);
|
|
#endif /* CONFIG_HW_WATCHDOG || CONFIG_WATCHDOG */
|
|
break;
|
|
#ifdef CONFIG_GZIP
|
|
case IH_COMP_GZIP:
|
|
printf(" Uncompressing part %d ... ", part);
|
|
if (gunzip((void *) dest, unc_len,
|
|
(uchar *) data, &len) != 0) {
|
|
puts("GUNZIP ERROR - image not loaded\n");
|
|
return 1;
|
|
}
|
|
break;
|
|
#endif
|
|
#if defined(CONFIG_BZIP2)
|
|
case IH_COMP_BZIP2:
|
|
{
|
|
int i;
|
|
|
|
printf(" Uncompressing part %d ... ", part);
|
|
/*
|
|
* If we've got less than 4 MB of malloc()
|
|
* space, use slower decompression algorithm
|
|
* which requires at most 2300 KB of memory.
|
|
*/
|
|
i = BZ2_bzBuffToBuffDecompress(
|
|
(char *)ntohl(hdr->ih_load),
|
|
&unc_len, (char *)data, len,
|
|
CONFIG_SYS_MALLOC_LEN < (4096 * 1024),
|
|
0);
|
|
if (i != BZ_OK) {
|
|
printf("BUNZIP2 ERROR %d - "
|
|
"image not loaded\n", i);
|
|
return 1;
|
|
}
|
|
}
|
|
break;
|
|
#endif /* CONFIG_BZIP2 */
|
|
default:
|
|
printf("Unimplemented compression type %d\n", comp);
|
|
return 1;
|
|
}
|
|
puts("OK\n");
|
|
}
|
|
|
|
sprintf(pbuf, "%8lx", data);
|
|
setenv("fileaddr", pbuf);
|
|
sprintf(pbuf, "%8lx", len);
|
|
setenv("filesize", pbuf);
|
|
|
|
return 0;
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
imxtract, 4, 1, do_imgextract,
|
|
"extract a part of a multi-image",
|
|
"addr part [dest]\n"
|
|
" - extract <part> from legacy image at <addr> and copy to <dest>"
|
|
#if defined(CONFIG_FIT)
|
|
"\n"
|
|
"addr uname [dest]\n"
|
|
" - extract <uname> subimage from FIT image at <addr> and copy to <dest>"
|
|
#endif
|
|
);
|