Patch by Robert Schwebel, 13 May 2004:

Add 'imgextract' command: extract one part of a multi file image.

Patch by Robert Schwebel, 13 May 2004:
Add 'imgextract' command: extract one part of a multi file image.
wdenk
1 parent 547b4cb25e
Showing 15 changed files with 193 additions and 28 deletions Side-by-side Diff
CHANGELOG
common/cmd_ximg.c
doc/README.mpc85xxads
include/cmd_confdefs.h
include/configs/ADNPESC1.h
include/configs/DK1C20.h
include/configs/DK1S10.h
include/configs/LANTEC.h
include/configs/MPC8260ADS.h
include/configs/MPC8266ADS.h
include/configs/RBC823.h
include/configs/RPXClassic.h
include/configs/ZPC1900.h
include/configs/ep8260.h
include/configs/hymod.h
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
  
+* Patch by Robert Schwebel, 13 May 2004:
+  Add 'imgextract' command: extract one part of a multi file image.
+
 * Patches by Jon Loeliger, 11 May 2004:
   Dynamically handle REV1 and REV2 MPC85xx parts.
     (Jon Loeliger, 10-May-2004).
+/*
+ * (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 */
@@ -5,10 +5,12 @@
 -----------------------------------------
  
 0. Toolchain
-The Binutils in current ELDK toolchain will not support MPC85xx chip. You need
-use the newest binutils-2.14.tar.bz2 from http://ftp.gnu.org/gnu/binutils.
+The Binutils in ELDK toolchain 3.0 or earlier does not support the
+MPC85xx chip. You need use the newest binutils-2.14.tar.bz2 from
+http://ftp.gnu.org/gnu/binutils.
  
 1. SWITCH SETTINGS & JUMPERS
+
 1.1 First, make sure the board default setting is consistent with the document
     shipped with your board. Then apply the following changes:
     SW3[1-6]="all OFF"  (boot from 32bit flash, no boot sequence is used)
  
@@ -19,11 +21,13 @@
     SW22[1-4]="OFF OFF ON OFF"
     SW5[1-10[="ON ON OFF OFF OFF OFF OFF OFF OFF OFF"
     J1 = "Enable Prog" (Make sure your flash is programmable for development)
+
 1.2 If you want to test PCI functionality with a 33Mhz PCI card, you will
     have to change the system clock from the default 66Mhz to 33Mhz by
     setting SW15[1]="OFF" and SW17[8]="OFF". After that you may also need
     double your platform clock(SW6) because the system clock is now only
-    half of its original value. 
+    half of its original value.
+
 1.3 SW6 is a very important switch, it decides your platform clock and CPU
     clock based on the on-board system clock(default 66MHz). Check the
     document along with your board for details.
@@ -35,7 +39,7 @@
      between u-boot and linux kernel, you can customize it based on your
      system requirements:
  
-     0x0000_0000     0x7fff_ffff     DDR                     2G 
+     0x0000_0000     0x7fff_ffff     DDR                     2G
      0x8000_0000     0x9fff_ffff     PCI MEM                 512M
      0xc000_0000     0xdfff_ffff     Rapid IO                512M
      0xe000_0000     0xe000_ffff     CCSR                    1M
  
@@ -52,7 +56,9 @@
 	arch/ppc/configs/mpc8540_ads_defconfig
 	arch/ppc/configs/mpc8560_ads_defconfig
  
+
 3. DEFINITIONS AND COMPILATION
+
 3.1 Explanation on NEW definitions in include/configs/MPC8540ADS.h and include/
     configs/MPC8560ADS.h
     CONFIG_BOOKE            BOOKE(e.g. Motorola MPC85xx, IBM 440, etc)
@@ -74,7 +80,6 @@
 			    if you can program the flash directly, undef this.
     Other than the above definitions, the rest in the config files are straightforward.
  
-
 3.2 Compilation
    export CROSS_COMPILE=your-cross-compile-prefix(assuming you're using BASH shell)
    cd u-boot
  
@@ -82,7 +87,9 @@
    make MPC8560ADS_config (or make MPC8540ADS_config)
    make
  
+
 4.  Notes:
+
 4.1 When connecting with kermit, the following commands must be present.in
    your .kermrc file. These are especially important when booting as
    MPC8560, as the serial console will not work without them:
@@ -93,7 +100,6 @@
 set flow-control none
 robust
  
-   
 4.2 Sometimes after U-Boot is up, the 'tftp' won't work well with TSEC ethernet. If that
    happens, you can try the following steps to make network work:
    MPC8560ADS>tftp 1000000 pImage
  
@@ -103,10 +109,10 @@
    >1
    >. (to quit this memory operation)
    MPC8560ADS>tftp 1000000 pImage
-4.3 If you're one of the early developers using the Rev1 8540/8560 chips, please use U-Boot 
+
+4.3 If you're one of the early developers using the Rev1 8540/8560 chips, please use U-Boot
    1.0.0, as the newer silicon will only support Rev2 and future revisions of 8540/8560.
  
-
 4.4 Reflash U-boot Image using U-boot
  
     => tftp 0 u-boot.bin
@@ -116,6 +122,7 @@
  
  
 5. Screen dump:
+
 5.1 MPC8540ADS board
 U-Boot 1.0.0-pre (Oct 15 2003 - 13:40:33)
  
@@ -22,7 +22,7 @@
  */
  
 /*
- *  Definitions for Configuring the monitor commands
+ * Definitions for Configuring the monitor commands
  */
 #ifndef _CMD_CONFIG_H
 #define _CMD_CONFIG_H
  
  
  
  
@@ -78,17 +78,18 @@
 #define CFG_CMD_SPI	0x0000100000000000U	/* SPI utility			*/
 #define CFG_CMD_FDOS	0x0000200000000000U	/* Floppy DOS support		*/
 #define CFG_CMD_VFD	0x0000400000000000U	/* VFD support (TRAB)		*/
-#define CFG_CMD_NAND	0x0000800000000000U	/* NAND support        		*/
+#define CFG_CMD_NAND	0x0000800000000000U	/* NAND support			*/
 #define CFG_CMD_BMP	0x0001000000000000U	/* BMP support			*/
-#define CFG_CMD_PORTIO	0x0002000000000000U	/* Port I/O		        */
+#define CFG_CMD_PORTIO	0x0002000000000000U	/* Port I/O			*/
 #define CFG_CMD_PING	0x0004000000000000U	/* ping support			*/
 #define CFG_CMD_MMC	0x0008000000000000U	/* MMC support			*/
 #define CFG_CMD_FAT	0x0010000000000000U	/* FAT support			*/
-#define CFG_CMD_IMLS	0x0020000000000000U	/* List all found images        */
+#define CFG_CMD_IMLS	0x0020000000000000U	/* List all found images	*/
 #define CFG_CMD_ITEST	0x0040000000000000U	/* Integer (and string) test	*/
 #define CFG_CMD_NFS	0x0080000000000000U	/* NFS support			*/
-#define CFG_CMD_REISER  0x0100000000000000U     /* Reiserfs support		*/
+#define CFG_CMD_REISER	0x0100000000000000U	/* Reiserfs support		*/
 #define CFG_CMD_CDP	0x0200000000000000U	/* Cisco Discovery Protocol 	*/
+#define CFG_CMD_XIMG	0x0400000000000000U	/* Load part of Multi Image	*/
  
 #define CFG_CMD_ALL	0xFFFFFFFFFFFFFFFFU	/* ALL commands			*/
  
@@ -156,7 +157,7 @@
 #define CONFIG_BOOTP_BOOTFILESIZE	0x00000020
 #define CONFIG_BOOTP_DNS		0x00000040
 #define CONFIG_BOOTP_DNS2		0x00000080
-#define CONFIG_BOOTP_SEND_HOSTNAME      0x00000100
+#define CONFIG_BOOTP_SEND_HOSTNAME	0x00000100
  
 #define CONFIG_BOOTP_VENDOREX		0x80000000
  
@@ -599,6 +599,7 @@
 				 CFG_CMD_SCSI	| \
 				 CFG_CMD_VFD	| \
 				 CFG_CMD_USB	| \
+				 CFG_CMD_XIMG	| \
 				 __SPI_CMD_OFF	) )
  
  
@@ -475,7 +475,8 @@
 				 CFG_CMD_SCSI	| \
 				 CFG_CMD_SPI	| \
 				 CFG_CMD_VFD	| \
-				 CFG_CMD_USB	) )
+				 CFG_CMD_USB	| \
+				 CFG_CMD_XIMG	) )
  
  
 #include <cmd_confdefs.h>
@@ -484,7 +484,8 @@
 				 CFG_CMD_SCSI	| \
 				 CFG_CMD_SPI	| \
 				 CFG_CMD_VFD	| \
-				 CFG_CMD_USB	) )
+				 CFG_CMD_USB	| \
+				 CFG_CMD_XIMG	) )
  
  
 #include <cmd_confdefs.h>
@@ -107,7 +107,8 @@
 					     & ~CFG_CMD_SCSI	\
 					     & ~CFG_CMD_SPI	\
 					     & ~CFG_CMD_USB	\
-					     & ~CFG_CMD_VFD	)
+					     & ~CFG_CMD_VFD	\
+					     & ~CFG_CMD_XIMG	)
  
 #if CONFIG_LANTEC >= 2
 #define	CONFIG_RTC_MPC8xx		/* use internal RTC of MPC8xx	*/
@@ -195,11 +195,12 @@
 				 CFG_CMD_NAND	| \
 				 CFG_CMD_PCI	| \
 				 CFG_CMD_PCMCIA | \
-				CFG_CMD_REISER	| \
+				 CFG_CMD_REISER	| \
 				 CFG_CMD_SCSI	| \
 				 CFG_CMD_SPI	| \
 				 CFG_CMD_USB	| \
-				 CFG_CMD_VFD
+				 CFG_CMD_VFD	| \
+				 CFG_CMD_XIMG
  
 #if CONFIG_ADSTYPE >= CFG_PQ2FADS
 #define CONFIG_COMMANDS		(CFG_CMD_ALL & ~( \
@@ -164,11 +164,12 @@
 				 CFG_CMD_MMC	| \
 				 CFG_CMD_NAND	| \
 				 CFG_CMD_PCMCIA | \
-				CFG_CMD_REISER	| \
+				 CFG_CMD_REISER	| \
 				 CFG_CMD_SCSI	| \
 				 CFG_CMD_SPI	| \
 				 CFG_CMD_VFD	| \
-				 CFG_CMD_USB	) )
+				 CFG_CMD_USB	| \
+				 CFG_CMD_XIMG	) )
  
 /* Define a command string that is automatically executed when no character
  * is read on the console interface withing "Boot Delay" after reset.
@@ -111,10 +111,11 @@
 				~CFG_CMD_PCMCIA	& \
 				~CFG_CMD_REISER	& \
 				~CFG_CMD_SCSI	& \
-				~CFG_CMD_SETGETDCR	& \
+				~CFG_CMD_SETGETDCR & \
 				~CFG_CMD_SPI	& \
 				~CFG_CMD_USB	& \
-				~CFG_CMD_VFD	)
+				~CFG_CMD_VFD	& \
+				~CFG_CMD_XIMG	)
  
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -93,7 +93,7 @@
 #define	CONFIG_CLOCKS_IN_MHZ	1	/* clocks passsed to Linux in MHz */
  
  
-#define CONFIG_COMMANDS	(CFG_CMD_ALL & ~CFG_CMD_NONSTD | CFG_CMD_ELF)
+#define CONFIG_COMMANDS	((CFG_CMD_ALL & ~CFG_CMD_NONSTD) | CFG_CMD_ELF)
  
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -134,7 +134,8 @@
 				 CFG_CMD_SCSI	| \
 				 CFG_CMD_SPI	| \
 				 CFG_CMD_USB	| \
-				 CFG_CMD_VFD    ) )
+				 CFG_CMD_VFD    | \
+				 CFG_CMD_XIMG	) )
  
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -275,6 +275,7 @@
 					~CFG_CMD_DCR    & \
 					~CFG_CMD_DHCP   & \
 					~CFG_CMD_DOC    & \
+					~CFG_CMD_DTT	& \
 					~CFG_CMD_EEPROM & \
 					~CFG_CMD_FDC    & \
 					~CFG_CMD_FDOS	& \
  
  
@@ -287,12 +288,12 @@
 					~CFG_CMD_NAND	& \
 					~CFG_CMD_PCI    & \
 					~CFG_CMD_PCMCIA & \
-					~CFG_CMD_SCSI   & \
 					~CFG_CMD_REISER	& \
+					~CFG_CMD_SCSI   & \
 					~CFG_CMD_SPI	& \
 					~CFG_CMD_USB	& \
 					~CFG_CMD_VFD	& \
-					~CFG_CMD_DTT )
+					~CFG_CMD_XIMG	)
  
 /* Where do the internal registers live? */
 #define CFG_IMMR               0xF0000000
@@ -191,7 +191,8 @@
 					CFG_CMD_REISER	| \
 					CFG_CMD_SCSI	| \
 					CFG_CMD_SPI	| \
-					CFG_CMD_VFD	) )
+					CFG_CMD_VFD	| \
+					CFG_CMD_XIMG	) )
  
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
...	...	@@ -2,6 +2,9 @@
2	2	Changes since U-Boot 1.1.1:
3	3	======================================================================
4	4
	5	+* Patch by Robert Schwebel, 13 May 2004:
	6	+ Add 'imgextract' command: extract one part of a multi file image.
	7	+
5	8	* Patches by Jon Loeliger, 11 May 2004:
6	9	Dynamically handle REV1 and REV2 MPC85xx parts.
7	10	(Jon Loeliger, 10-May-2004).
	1	+/*
	2	+ * (C) Copyright 2000-2004
	3	+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
	4	+ *
	5	+ * (C) Copyright 2003
	6	+ * Kai-Uwe Bloem, Auerswald GmbH & Co KG, <linux-development@auerswald.de>
	7	+ *
	8	+ * See file CREDITS for list of people who contributed to this
	9	+ * project.
	10	+ *
	11	+ * This program is free software; you can redistribute it and/or
	12	+ * modify it under the terms of the GNU General Public License as
	13	+ * published by the Free Software Foundation; either version 2 of
	14	+ * the License, or (at your option) any later version.
	15	+ *
	16	+ * This program is distributed in the hope that it will be useful,
	17	+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
	18	+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	19	+ * GNU General Public License for more details.
	20	+ *
	21	+ * You should have received a copy of the GNU General Public License
	22	+ * along with this program; if not, write to the Free Software
	23	+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
	24	+ * MA 02111-1307 USA
	25	+ */
	26	+
	27	+#if (CONFIG_COMMANDS & CFG_CMD_XIMG)
	28	+
	29	+/*
	30	+ * Multi Image extract
	31	+ */
	32	+#include <common.h>
	33	+#include <command.h>
	34	+#include <image.h>
	35	+#include <asm/byteorder.h>
	36	+
	37	+int
	38	+do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
	39	+{
	40	+ ulong addr = load_addr, dest = 0;
	41	+ ulong data, len, checksum;
	42	+ ulong *len_ptr;
	43	+ int i, verify, part = 0;
	44	+ char pbuf[10], *s;
	45	+ image_header_t header;
	46	+
	47	+ s = getenv("verify");
	48	+ verify = (s && (*s == 'n')) ? 0 : 1;
	49	+
	50	+ if (argc > 1) {
	51	+ addr = simple_strtoul(argv[1], NULL, 16);
	52	+ }
	53	+ if (argc > 2) {
	54	+ part = simple_strtoul(argv[2], NULL, 16);
	55	+ }
	56	+ if (argc > 3) {
	57	+ dest = simple_strtoul(argv[3], NULL, 16);
	58	+ }
	59	+
	60	+ printf("## Copying from image at %08lx ...\n", addr);
	61	+
	62	+ /* Copy header so we can blank CRC field for re-calculation */
	63	+ memmove(&header, (char *) addr, sizeof (image_header_t));
	64	+
	65	+ if (ntohl(header.ih_magic) != IH_MAGIC) {
	66	+ printf("Bad Magic Number\n");
	67	+ return 1;
	68	+ }
	69	+
	70	+ data = (ulong) & header;
	71	+ len = sizeof (image_header_t);
	72	+
	73	+ checksum = ntohl(header.ih_hcrc);
	74	+ header.ih_hcrc = 0;
	75	+
	76	+ if (crc32(0, (char *) data, len) != checksum) {
	77	+ printf("Bad Header Checksum\n");
	78	+ return 1;
	79	+ }
	80	+#ifdef DEBUG
	81	+ print_image_hdr((image_header_t *) addr);
	82	+#endif
	83	+
	84	+ data = addr + sizeof (image_header_t);
	85	+ len = ntohl(header.ih_size);
	86	+
	87	+ if (header.ih_type != IH_TYPE_MULTI) {
	88	+ printf("Wrong Image Type for %s command\n", cmdtp->name);
	89	+ return 1;
	90	+ }
	91	+
	92	+ if (header.ih_comp != IH_COMP_NONE) {
	93	+ printf("Wrong Compression Type for %s command\n", cmdtp->name);
	94	+ return 1;
	95	+ }
	96	+
	97	+ if (verify) {
	98	+ printf(" Verifying Checksum ... ");
	99	+ if (crc32(0, (char *) data, len) != ntohl(header.ih_dcrc)) {
	100	+ printf("Bad Data CRC\n");
	101	+ return 1;
	102	+ }
	103	+ printf("OK\n");
	104	+ }
	105	+
	106	+ len_ptr = (ulong *) data;
	107	+
	108	+ data += 4; /* terminator */
	109	+ for (i = 0; len_ptr[i]; ++i) {
	110	+ data += 4;
	111	+ if (argc > 2 && part > i) {
	112	+ u_long tail;
	113	+ len = ntohl(len_ptr[i]);
	114	+ tail = len % 4;
	115	+ data += len;
	116	+ if (tail) {
	117	+ data += 4 - tail;
	118	+ }
	119	+ }
	120	+ }
	121	+ if (argc > 2 && part >= i) {
	122	+ printf("Bad Image Part\n");
	123	+ return 1;
	124	+ }
	125	+ len = ntohl(len_ptr[part]);
	126	+
	127	+ if (argc > 3) {
	128	+ memcpy((char ) dest, (char ) data, len);
	129	+ }
	130	+
	131	+ sprintf(pbuf, "%8lx", data);
	132	+ setenv("fileaddr", pbuf);
	133	+ sprintf(pbuf, "%8lx", len);
	134	+ setenv("filesize", pbuf);
	135	+
	136	+ return 0;
	137	+}
	138	+
	139	+U_BOOT_CMD(imxtract, 4, 1, do_imgextract,
	140	+ "imxtract- extract a part of a multi-image\n",
	141	+ "addr part [dest]\n"
	142	+ " - extract <part> from image at <addr> and copy to <dest>\n");
	143	+
	144	+#endif /* CONFIG_COMMANDS & CFG_CMD_XIMG */
...	...	@@ -5,10 +5,12 @@
5	5	-----------------------------------------
6	6
7	7	0. Toolchain
8		-The Binutils in current ELDK toolchain will not support MPC85xx chip. You need
9		-use the newest binutils-2.14.tar.bz2 from http://ftp.gnu.org/gnu/binutils.
	8	+The Binutils in ELDK toolchain 3.0 or earlier does not support the
	9	+MPC85xx chip. You need use the newest binutils-2.14.tar.bz2 from
	10	+http://ftp.gnu.org/gnu/binutils.
10	11
11	12	1. SWITCH SETTINGS & JUMPERS
	13	+
12	14	1.1 First, make sure the board default setting is consistent with the document
13	15	shipped with your board. Then apply the following changes:
14	16	SW3[1-6]="all OFF" (boot from 32bit flash, no boot sequence is used)
15	17
...	...	@@ -19,11 +21,13 @@
19	21	SW22[1-4]="OFF OFF ON OFF"
20	22	SW5[1-10[="ON ON OFF OFF OFF OFF OFF OFF OFF OFF"
21	23	J1 = "Enable Prog" (Make sure your flash is programmable for development)
	24	+
22	25	1.2 If you want to test PCI functionality with a 33Mhz PCI card, you will
23	26	have to change the system clock from the default 66Mhz to 33Mhz by
24	27	setting SW15[1]="OFF" and SW17[8]="OFF". After that you may also need
25	28	double your platform clock(SW6) because the system clock is now only
26		- half of its original value.
	29	+ half of its original value.
	30	+
27	31	1.3 SW6 is a very important switch, it decides your platform clock and CPU
28	32	clock based on the on-board system clock(default 66MHz). Check the
29	33	document along with your board for details.
...	...	@@ -35,7 +39,7 @@
35	39	between u-boot and linux kernel, you can customize it based on your
36	40	system requirements:
37	41
38		- 0x0000_0000 0x7fff_ffff DDR 2G
	42	+ 0x0000_0000 0x7fff_ffff DDR 2G
39	43	0x8000_0000 0x9fff_ffff PCI MEM 512M
40	44	0xc000_0000 0xdfff_ffff Rapid IO 512M
41	45	0xe000_0000 0xe000_ffff CCSR 1M
42	46
...	...	@@ -52,7 +56,9 @@
52	56	arch/ppc/configs/mpc8540_ads_defconfig
53	57	arch/ppc/configs/mpc8560_ads_defconfig
54	58
	59	+
55	60	3. DEFINITIONS AND COMPILATION
	61	+
56	62	3.1 Explanation on NEW definitions in include/configs/MPC8540ADS.h and include/
57	63	configs/MPC8560ADS.h
58	64	CONFIG_BOOKE BOOKE(e.g. Motorola MPC85xx, IBM 440, etc)
...	...	@@ -74,7 +80,6 @@
74	80	if you can program the flash directly, undef this.
75	81	Other than the above definitions, the rest in the config files are straightforward.
76	82
77		-
78	83	3.2 Compilation
79	84	export CROSS_COMPILE=your-cross-compile-prefix(assuming you're using BASH shell)
80	85	cd u-boot
81	86
...	...	@@ -82,7 +87,9 @@
82	87	make MPC8560ADS_config (or make MPC8540ADS_config)
83	88	make
84	89
	90	+
85	91	4. Notes:
	92	+
86	93	4.1 When connecting with kermit, the following commands must be present.in
87	94	your .kermrc file. These are especially important when booting as
88	95	MPC8560, as the serial console will not work without them:
...	...	@@ -93,7 +100,6 @@
93	100	set flow-control none
94	101	robust
95	102
96		-
97	103	4.2 Sometimes after U-Boot is up, the 'tftp' won't work well with TSEC ethernet. If that
98	104	happens, you can try the following steps to make network work:
99	105	MPC8560ADS>tftp 1000000 pImage
100	106
...	...	@@ -103,10 +109,10 @@
103	109	>1
104	110	>. (to quit this memory operation)
105	111	MPC8560ADS>tftp 1000000 pImage
106		-4.3 If you're one of the early developers using the Rev1 8540/8560 chips, please use U-Boot
	112	+
	113	+4.3 If you're one of the early developers using the Rev1 8540/8560 chips, please use U-Boot
107	114	1.0.0, as the newer silicon will only support Rev2 and future revisions of 8540/8560.
108	115
109		-
110	116	4.4 Reflash U-boot Image using U-boot
111	117
112	118	=> tftp 0 u-boot.bin
...	...	@@ -116,6 +122,7 @@
116	122
117	123
118	124	5. Screen dump:
	125	+
119	126	5.1 MPC8540ADS board
120	127	U-Boot 1.0.0-pre (Oct 15 2003 - 13:40:33)
121	128
...	...	@@ -22,7 +22,7 @@
22	22	*/
23	23
24	24	/*
25		- * Definitions for Configuring the monitor commands
	25	+ * Definitions for Configuring the monitor commands
26	26	*/
27	27	#ifndef _CMD_CONFIG_H
28	28	#define _CMD_CONFIG_H
29	29
30	30
31	31
32	32
...	...	@@ -78,17 +78,18 @@
78	78	#define CFG_CMD_SPI 0x0000100000000000U /* SPI utility */
79	79	#define CFG_CMD_FDOS 0x0000200000000000U /* Floppy DOS support */
80	80	#define CFG_CMD_VFD 0x0000400000000000U /* VFD support (TRAB) */
81		-#define CFG_CMD_NAND 0x0000800000000000U /* NAND support */
	81	+#define CFG_CMD_NAND 0x0000800000000000U /* NAND support */
82	82	#define CFG_CMD_BMP 0x0001000000000000U /* BMP support */
83		-#define CFG_CMD_PORTIO 0x0002000000000000U /* Port I/O */
	83	+#define CFG_CMD_PORTIO 0x0002000000000000U /* Port I/O */
84	84	#define CFG_CMD_PING 0x0004000000000000U /* ping support */
85	85	#define CFG_CMD_MMC 0x0008000000000000U /* MMC support */
86	86	#define CFG_CMD_FAT 0x0010000000000000U /* FAT support */
87		-#define CFG_CMD_IMLS 0x0020000000000000U /* List all found images */
	87	+#define CFG_CMD_IMLS 0x0020000000000000U /* List all found images */
88	88	#define CFG_CMD_ITEST 0x0040000000000000U /* Integer (and string) test */
89	89	#define CFG_CMD_NFS 0x0080000000000000U /* NFS support */
90		-#define CFG_CMD_REISER 0x0100000000000000U /* Reiserfs support */
	90	+#define CFG_CMD_REISER 0x0100000000000000U /* Reiserfs support */
91	91	#define CFG_CMD_CDP 0x0200000000000000U /* Cisco Discovery Protocol */
	92	+#define CFG_CMD_XIMG 0x0400000000000000U /* Load part of Multi Image */
92	93
93	94	#define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFU /* ALL commands */
94	95
...	...	@@ -156,7 +157,7 @@
156	157	#define CONFIG_BOOTP_BOOTFILESIZE 0x00000020
157	158	#define CONFIG_BOOTP_DNS 0x00000040
158	159	#define CONFIG_BOOTP_DNS2 0x00000080
159		-#define CONFIG_BOOTP_SEND_HOSTNAME 0x00000100
	160	+#define CONFIG_BOOTP_SEND_HOSTNAME 0x00000100
160	161
161	162	#define CONFIG_BOOTP_VENDOREX 0x80000000
162	163
...	...	@@ -599,6 +599,7 @@
599	599	CFG_CMD_SCSI \| \
600	600	CFG_CMD_VFD \| \
601	601	CFG_CMD_USB \| \
	602	+ CFG_CMD_XIMG \| \
602	603	__SPI_CMD_OFF ) )
603	604
604	605
...	...	@@ -475,7 +475,8 @@
475	475	CFG_CMD_SCSI \| \
476	476	CFG_CMD_SPI \| \
477	477	CFG_CMD_VFD \| \
478		- CFG_CMD_USB ) )
	478	+ CFG_CMD_USB \| \
	479	+ CFG_CMD_XIMG ) )
479	480
480	481
481	482	#include <cmd_confdefs.h>
...	...	@@ -484,7 +484,8 @@
484	484	CFG_CMD_SCSI \| \
485	485	CFG_CMD_SPI \| \
486	486	CFG_CMD_VFD \| \
487		- CFG_CMD_USB ) )
	487	+ CFG_CMD_USB \| \
	488	+ CFG_CMD_XIMG ) )
488	489
489	490
490	491	#include <cmd_confdefs.h>
...	...	@@ -107,7 +107,8 @@
107	107	& ~CFG_CMD_SCSI \
108	108	& ~CFG_CMD_SPI \
109	109	& ~CFG_CMD_USB \
110		- & ~CFG_CMD_VFD )
	110	+ & ~CFG_CMD_VFD \
	111	+ & ~CFG_CMD_XIMG )
111	112
112	113	#if CONFIG_LANTEC >= 2
113	114	#define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */
...	...	@@ -195,11 +195,12 @@
195	195	CFG_CMD_NAND \| \
196	196	CFG_CMD_PCI \| \
197	197	CFG_CMD_PCMCIA \| \
198		- CFG_CMD_REISER \| \
	198	+ CFG_CMD_REISER \| \
199	199	CFG_CMD_SCSI \| \
200	200	CFG_CMD_SPI \| \
201	201	CFG_CMD_USB \| \
202		- CFG_CMD_VFD
	202	+ CFG_CMD_VFD \| \
	203	+ CFG_CMD_XIMG
203	204
204	205	#if CONFIG_ADSTYPE >= CFG_PQ2FADS
205	206	#define CONFIG_COMMANDS (CFG_CMD_ALL & ~( \
...	...	@@ -164,11 +164,12 @@
164	164	CFG_CMD_MMC \| \
165	165	CFG_CMD_NAND \| \
166	166	CFG_CMD_PCMCIA \| \
167		- CFG_CMD_REISER \| \
	167	+ CFG_CMD_REISER \| \
168	168	CFG_CMD_SCSI \| \
169	169	CFG_CMD_SPI \| \
170	170	CFG_CMD_VFD \| \
171		- CFG_CMD_USB ) )
	171	+ CFG_CMD_USB \| \
	172	+ CFG_CMD_XIMG ) )
172	173
173	174	/* Define a command string that is automatically executed when no character
174	175	* is read on the console interface withing "Boot Delay" after reset.