Patch by Robert Schwebel, 13 May 2004:
Add 'imgextract' command: extract one part of a multi file image.
diff --git a/common/cmd_ximg.c b/common/cmd_ximg.c
new file mode 100644
index 0000000..8359153
--- /dev/null
+++ b/common/cmd_ximg.c
@@ -0,0 +1,144 @@
+/*
+ * (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
+ */
+
+#if (CONFIG_COMMANDS & CFG_CMD_XIMG)
+
+/*
+ * 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, dest = 0;
+ ulong data, len, checksum;
+ ulong *len_ptr;
+ int i, verify, part = 0;
+ char pbuf[10], *s;
+ image_header_t header;
+
+ s = getenv("verify");
+ verify = (s && (*s == 'n')) ? 0 : 1;
+
+ if (argc > 1) {
+ addr = simple_strtoul(argv[1], NULL, 16);
+ }
+ if (argc > 2) {
+ part = simple_strtoul(argv[2], NULL, 16);
+ }
+ if (argc > 3) {
+ dest = simple_strtoul(argv[3], NULL, 16);
+ }
+
+ printf("## Copying from image at %08lx ...\n", addr);
+
+ /* Copy header so we can blank CRC field for re-calculation */
+ memmove(&header, (char *) addr, sizeof (image_header_t));
+
+ if (ntohl(header.ih_magic) != IH_MAGIC) {
+ printf("Bad Magic Number\n");
+ return 1;
+ }
+
+ data = (ulong) & header;
+ len = sizeof (image_header_t);
+
+ checksum = ntohl(header.ih_hcrc);
+ header.ih_hcrc = 0;
+
+ if (crc32(0, (char *) data, len) != checksum) {
+ printf("Bad Header Checksum\n");
+ return 1;
+ }
+#ifdef DEBUG
+ print_image_hdr((image_header_t *) addr);
+#endif
+
+ data = addr + sizeof (image_header_t);
+ len = ntohl(header.ih_size);
+
+ if (header.ih_type != IH_TYPE_MULTI) {
+ printf("Wrong Image Type for %s command\n", cmdtp->name);
+ return 1;
+ }
+
+ if (header.ih_comp != IH_COMP_NONE) {
+ printf("Wrong Compression Type for %s command\n", cmdtp->name);
+ return 1;
+ }
+
+ if (verify) {
+ printf(" Verifying Checksum ... ");
+ if (crc32(0, (char *) data, len) != ntohl(header.ih_dcrc)) {
+ printf("Bad Data CRC\n");
+ return 1;
+ }
+ printf("OK\n");
+ }
+
+ len_ptr = (ulong *) data;
+
+ data += 4; /* terminator */
+ for (i = 0; len_ptr[i]; ++i) {
+ data += 4;
+ if (argc > 2 && part > i) {
+ u_long tail;
+ len = ntohl(len_ptr[i]);
+ tail = len % 4;
+ data += len;
+ if (tail) {
+ data += 4 - tail;
+ }
+ }
+ }
+ if (argc > 2 && part >= i) {
+ printf("Bad Image Part\n");
+ return 1;
+ }
+ len = ntohl(len_ptr[part]);
+
+ 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,
+ "imxtract- extract a part of a multi-image\n",
+ "addr part [dest]\n"
+ " - extract <part> from image at <addr> and copy to <dest>\n");
+
+#endif /* CONFIG_COMMANDS & CFG_CMD_XIMG */