mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 18:35:42 +01:00 
			
		
		
		
	Many of the help messages were not really helpful; for example, many commands that take no arguments would not print a correct synopsis line, but "No additional help available." which is not exactly wrong, but not helpful either. Commit ``Make "usage" messages more helpful.'' changed this partially. But it also became clear that lots of "Usage" and "Help" messages (fields "usage" and "help" in struct cmd_tbl_s respective) were actually redundant. This patch cleans this up - for example: Before: => help dtt dtt - Digital Thermometer and Thermostat Usage: dtt - Read temperature from digital thermometer and thermostat. After: => help dtt dtt - Read temperature from Digital Thermometer and Thermostat Usage: dtt Signed-off-by: Wolfgang Denk <wd@denx.de>
		
			
				
	
	
		
			192 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			192 lines
		
	
	
		
			4.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 <asm/byteorder.h>
 | |
| 
 | |
| int
 | |
| do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *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
 | |
| 
 | |
| 	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;
 | |
| 		}
 | |
| 
 | |
| 		if (image_get_comp (hdr) != IH_COMP_NONE) {
 | |
| 			printf("Wrong Compression Type for %s command\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)) {
 | |
| 			printf("Wrong Compression Type for %s command\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;
 | |
| 		}
 | |
| 
 | |
| 		data = (ulong)fit_data;
 | |
| 		len = (ulong)fit_len;
 | |
| 		break;
 | |
| #endif
 | |
| 	default:
 | |
| 		puts ("Invalid image type for imxtract\n");
 | |
| 		return 1;
 | |
| 	}
 | |
| 
 | |
| 	if (argc > 3) {
 | |
| 		memcpy((char *) dest, (char *) data, len);
 | |
| 	}
 | |
| 
 | |
| 	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
 | |
| );
 |