mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-19 11:18:28 +00:00
088f1b1991
cmd_boot.c:40:5: warning: symbol 'do_go' was not declared. Should it be static? cmd_bootm.c:164:6: warning: symbol '__arch_preboot_os' was not declared. Should it be static? cmd_bootm.c:477:5: warning: symbol 'do_bootm_subcommand' was not declared. Should it be static? cmd_bootm.c:1022:1: error: directive in argument list cmd_bootm.c:1028:1: error: directive in argument list cmd_bootm.c:1029:1: error: directive in argument list cmd_bootm.c:1036:1: error: directive in argument list cmd_bootm.c:1042:1: error: directive in argument list cmd_bootm.c:1044:1: error: directive in argument list cmd_bootm.c:1045:1: error: directive in argument list cmd_bootm.c:1047:1: error: directive in argument list cmd_bootm.c:1089:5: warning: symbol 'do_iminfo' was not declared. Should it be static? cmd_bootm.c:1176:5: warning: symbol 'do_imls' was not declared. Should it be static? cmd_bootm.c:1654:1: error: directive in argument list cmd_bootm.c:1660:1: error: directive in argument list cmd_console.c:32:5: warning: symbol 'do_coninfo' was not declared. Should it be s cmd_date.c:46:5: warning: symbol 'do_date' was not declared. Should it be static? cmd_echo.c:27:5: warning: symbol 'do_echo' was not declared. Should it be static? cmd_exit.c:27:5: warning: symbol 'do_exit' was not declared. Should it be static? cmd_fat.c:97:5: warning: symbol 'do_fat_ls' was not declared. Should it be static? cmd_fat.c:136:5: warning: symbol 'do_fat_fsinfo' was not declared. Should it be s cmd_fdt.c:66:5: warning: symbol 'do_fdt' was not declared. Should it be static? cmd_fdt.c:542:43: warning: incorrect type in assignment (different base types) cmd_fdt.c:542:43: expected unsigned int [unsigned] [usertype] <noident> cmd_fdt.c:542:43: got restricted __be32 [usertype] <noident> cmd_fdt.c:679:42: warning: cast to restricted __be32 cmd_fdt.c:820:1: error: directive in argument list cmd_fdt.c:822:1: error: directive in argument list cmd_flash.c:292:5: warning: symbol 'do_flinfo' was not declared. Should it be static? cmd_flash.c:324:5: warning: symbol 'do_flerase' was not declared. Should it be static? cmd_flash.c:457:5: warning: symbol 'do_protect' was not declared. Should it be st cmd_help.c:27:5: warning: symbol 'do_help' was not declared. Should it be static? cmd_i2c.c:136:6: warning: symbol '__def_i2c_init_board' was not declared. Should it be static? cmd_i2c.c:144:14: warning: symbol '__def_i2c_get_bus_speed' was not declared. Should it be static? cmd_i2c.c:151:5: warning: symbol '__def_i2c_set_bus_speed' was not declared. Should it be static? cmd_i2c.c:1322:1: error: directive in argument list cmd_i2c.c:1324:1: error: directive in argument list cmd_i2c.c:1326:1: error: directive in argument list cmd_i2c.c:1328:1: error: directive in argument list cmd_i2c.c:1337:1: error: directive in argument list cmd_i2c.c:1339:1: error: directive in argument list cmd_irq.c:27:5: warning: symbol 'do_interrupts' was not declared. Should it be static? cmd_itest.c:133:5: warning: symbol 'binary_test' was not declared. Should it be static? cmd_itest.c:158:5: warning: symbol 'do_itest' was not declared. Should it be stat cmd_load.c:54:5: warning: symbol 'do_load_serial' was not declared. Should it be static? cmd_load.c:431:6: warning: symbol 'his_eol' was not declared. Should it be static? cmd_load.c:432:6: warning: symbol 'his_pad_count' was not declared. Should it be static? cmd_load.c:433:6: warning: symbol 'his_pad_char' was not declared. Should it be static? cmd_load.c:434:6: warning: symbol 'his_quote' was not declared. Should it be static? cmd_load.c:436:5: warning: symbol 'do_load_serial_bin' was not declared. Should it be static? cmd_load.c:549:6: warning: symbol 'send_pad' was not declared. Should it be static? cmd_load.c:558:6: warning: symbol 'ktrans' was not declared. Should it be static? cmd_load.c:568:5: warning: symbol 'chk1' was not declared. Should it be static? cmd_load.c:578:6: warning: symbol 's1_sendpacket' was not declared. Should it be static? cmd_load.c:587:6: warning: symbol 'send_ack' was not declared. Should it be static? cmd_load.c:600:6: warning: symbol 'send_nack' was not declared. Should it be static? cmd_load.c:614:6: warning: symbol 'os_data_init' was not declared. Should it be static? cmd_load.c:615:6: warning: symbol 'os_data_char' was not declared. Should it be static? cmd_load.c:657:6: warning: symbol 'k_data_init' was not declared. Should it be static? cmd_load.c:663:6: warning: symbol 'k_data_save' was not declared. Should it be static? cmd_load.c:669:6: warning: symbol 'k_data_restore' was not declared. Should it be static? cmd_load.c:675:6: warning: symbol 'k_data_char' was not declared. Should it be static? cmd_load.c:693:6: warning: symbol 'send_parms' was not declared. Should it be static? cmd_load.c:694:6: warning: symbol 'send_ptr' was not declared. Should it be static? cmd_load.c:698:6: warning: symbol 'handle_send_packet' was not declared. Should i cmd_mdio.c:60:5: warning: symbol 'mdio_write_ranges' was not declared. Should it be static? cmd_mdio.c:82:5: warning: symbol 'mdio_read_ranges' was not declared. Should it be static? cmd_mdio.c:115:5: warning: symbol 'extract_reg_range' was not declared. Should it be static? cmd_mdio.c:144:5: warning: symbol 'extract_phy_range' was not declared. Should it cmd_mem.c:54:5: warning: symbol 'do_mem_md' was not declared. Should it be static? cmd_mem.c:150:5: warning: symbol 'do_mem_mm' was not declared. Should it be static? cmd_mem.c:154:5: warning: symbol 'do_mem_nm' was not declared. Should it be static? cmd_mem.c:159:5: warning: symbol 'do_mem_mw' was not declared. Should it be static? cmd_mem.c:256:5: warning: symbol 'do_mem_cmp' was not declared. Should it be static? cmd_mem.c:326:5: warning: symbol 'do_mem_cp' was not declared. Should it be static? cmd_mem.c:436:5: warning: symbol 'do_mem_base' was not declared. Should it be static? cmd_mem.c:449:5: warning: symbol 'do_mem_loop' was not declared. Should it be static? cmd_mem.c:595:5: warning: symbol 'do_mem_mtest' was not declared. Should it be static? cmd_mem.c:618:26: warning: Using plain integer as NULL pointer cmd_mem.c:1057:5: warning: symbol 'do_mem_crc' was not declared. Should it be static? cmd_misc.c:30:5: warning: symbol 'do_sleep' was not declared. Should it be static cmd_mmc.c:118:5: warning: symbol 'do_mmcinfo' was not declared. Should it be static? cmd_mmc.c:272:32: warning: Using plain integer as NULL pointer cmd_mmc.c:150:5: warning: symbol 'do_mmcops' was not declared. Should it be stati cmd_mp.c:27:1: warning: symbol 'cpu_cmd' was not declared. Should it be static? cmd_mp.c:85:1: error: directive in argument list cmd_mp.c:88:1: error: directive in argument list cmd_mtdparts.c:150:18: warning: symbol 'mtdids' was not declared. Should it be static? cmd_mtdparts.c:153:18: warning: symbol 'devices' was not declared. Should it be static? cmd_mtdparts.c:713:5: warning: symbol 'mtd_device_validate' was not declared. Should it be static? cmd_mtdparts.c:1887:5: warning: symbol 'do_chpart' was not declared. Should it be static? cmd_mtdparts.c:1925:5: warning: symbol 'do_mtdparts' was not declared. Should it be static? cmd_mtdparts.c:2060:1: error: directive in argument list cmd_mtdparts.c:2063:1: error: directive in argument list cmd_mtdparts.c:2066:1: error: directive in argument list cmd_mtdparts.c:2071:1: error: directive in argument list cmd_mtdparts.c:2073:1: error: directive in argument list cmd_nand.c:377:18: error: bad constant expression cmd_nand.c:431:5: warning: symbol 'do_nand' was not declared. Should it be static? cmd_nand.c:796:1: error: directive in argument list cmd_nand.c:801:1: error: directive in argument list cmd_nand.c:802:1: error: directive in argument list cmd_nand.c:806:1: error: directive in argument list cmd_nand.c:819:1: error: directive in argument list cmd_nand.c:824:1: error: directive in argument list cmd_nand.c:825:1: error: directive in argument list cmd_nand.c:831:1: error: directive in argument list cmd_nand.c:918:5: warning: symbol 'do_nandboot' was not declared. Should it be static? cmd_net.c:33:5: warning: symbol 'do_bootp' was not declared. Should it be static? cmd_net.c:107:5: warning: symbol 'do_dhcp' was not declared. Should it be static? cmd_net.c:120:5: warning: symbol 'do_nfs' was not declared. Should it be static? cmd_nvedit.c:138:5: warning: symbol 'do_env_print' was not declared. Should it be static? cmd_nvedit.c:323:5: warning: symbol '_do_env_set' was not declared. Should it be static? cmd_nvedit.c:435:5: warning: symbol 'do_env_set' was not declared. Should it be static? cmd_nvedit.c:514:5: warning: symbol 'do_env_edit' was not declared. Should it be static? cmd_nvedit.c:620:5: warning: symbol 'do_env_save' was not declared. Should it be static? cmd_nvedit.c:1016:1: error: directive in argument list cmd_nvedit.c:1018:1: error: directive in argument list cmd_nvedit.c:1021:1: error: directive in argument list cmd_nvedit.c:1023:1: error: directive in argument list cmd_nvedit.c:1024:1: error: directive in argument list cmd_nvedit.c:1026:1: error: directive in argument list cmd_nvedit.c:1027:1: error: directive in argument list cmd_nvedit.c:1029:1: error: directive in argument list cmd_nvedit.c:1030:1: error: directive in argument list cmd_nvedit.c:1032:1: error: directive in argument list cmd_nvedit.c:1034:1: error: directive in argument list cmd_nvedit.c:1036:1: error: directive in argument list cmd_nvedit.c:1037:1: error: directive in argument list cmd_nvedit.c:1039:1: error: directive in argument list cmd_pci.c:38:17: warning: symbol 'ShortPCIListing' was not declared. Should it be static? cmd_pci.c:38:22: warning: 'ShortPCIListing' defined but not used [-Wunused-variable] cmd_pci.c:411:5: warning: symbol 'do_pci' was not declared. Should it be static? cmd_pci.c:494:1: error: directive in argument list cmd_pci.c:497:1: error: directive in argument list cmd_reginfo.c:40:5: warning: symbol 'do_reginfo' was not declared. Should it be static? cmd_sata.c:31:5: warning: symbol 'sata_curr_device' was not declared. Should it be static? note -> ata_piix.c doesn't seem to use 'sata_curr_device'; deleted. cmd_sata.c:32:18: warning: symbol 'sata_dev_desc' was not declared. Should it be static? cmd_sata.c:70:5: warning: symbol 'do_sata' was not declared. Should it be static? cmd_setexpr.c:53:5: warning: symbol 'do_setexpr' was not declared. Should it be static? cmd_source.c:186:1: error: directive in argument list cmd_source.c:190:1: error: directive in argument list cmd_test.c:27:5: warning: symbol 'do_test' was not declared. Should it be static? cmd_test.c:153:5: warning: symbol 'do_false' was not declared. Should it be static? cmd_test.c:164:5: warning: symbol 'do_true' was not declared. Should it be static cmd_usb.c:43:6: warning: symbol 'usb_get_class_desc' was not declared. Should it be static? cmd_usb.c:69:6: warning: symbol 'usb_display_class_sub' was not declared. Should it be static? cmd_usb.c:151:6: warning: symbol 'usb_display_string' was not declared. Should it be static? cmd_usb.c:161:6: warning: symbol 'usb_display_desc' was not declared. Should it be static? cmd_usb.c:195:6: warning: symbol 'usb_display_conf_desc' was not declared. Should it be static? cmd_usb.c:210:6: warning: symbol 'usb_display_if_desc' was not declared. Should it be static? cmd_usb.c:227:6: warning: symbol 'usb_display_ep_desc' was not declared. Should it be static? cmd_usb.c:252:6: warning: symbol 'usb_display_config' was not declared. Should it be static? cmd_usb.c:283:6: warning: symbol 'usb_show_tree_graph' was not declared. Should it be static? cmd_usb.c:343:6: warning: symbol 'usb_show_tree' was not declared. Should it be static? cmd_usb.c:356:5: warning: symbol 'do_usbboot' was not declared. Should it be static? cmd_usb.c:366:5: warning: symbol 'do_usb' was not declared. Should it be static? cmd_version.c:31:5: warning: symbol 'do_version' was not declared. Should it be s cmd_ximg.c:46:1: warning: symbol 'do_imgextract' was not declared. Should it be static? cmd_ximg.c:272:1: error: directive in argument list cmd_ximg.c:276:1: error: directive in argument list Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
282 lines
6.3 KiB
C
282 lines
6.3 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
|
|
|
|
static 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;
|
|
}
|
|
|
|
#ifdef CONFIG_SYS_LONGHELP
|
|
static char imgextract_help_text[] =
|
|
"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
|
|
"";
|
|
#endif
|
|
|
|
U_BOOT_CMD(
|
|
imxtract, 4, 1, do_imgextract,
|
|
"extract a part of a multi-image", imgextract_help_text
|
|
);
|