* Patches by Jon Diekema, 17 Sep 2003:

  - update README (SHOW_BOOT_PROGRESS values for cmd_nand.c and
    env_common.c)
  - sbc8260 tweaks
  - adjust "help" output

5 files changed, 71 insertions, 32 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9782fd49b0..7c236b56c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,15 @@
 Changes for U-Boot 1.0.0:
 ======================================================================
 
+* Patch by Rune Torgersen, 17 Sep 2003:
+  - Fixes for MPC8266 default config
+
+* Patches by Jon Diekema, 17 Sep 2003:
+  - update README (SHOW_BOOT_PROGRESS values for cmd_nand.c and
+    env_common.c)
+  - sbc8260 tweaks
+  - adjust "help" output
+
 * Patches by Anders Larsen, 17 Sep 2003:
   - fix spelling errors
   - set GD_FLG_DEVINIT flag only after device function pointers
diff --git a/README b/README
index aee88ed725..1471cb5dee 100644
--- a/README
+++ b/README
@@ -1416,7 +1416,13 @@ The following options need to be configured:
    -1	common/cmd_ide.c	Read Error on boot device
    -1	common/cmd_ide.c	Image header has bad magic number
 
-   -1	common/cmd_nvedit.c	Environment not changable, but has bad CRC
+   -1	common/cmd_nand.c	Bad usage of "nand" command
+   -1	common/cmd_nand.c	No boot device
+   -1	common/cmd_nand.c	Unknown Chip ID on boot device
+   -1	common/cmd_nand.c	Read Error on boot device
+   -1	common/cmd_nand.c	Image header has bad magic number
+
+   -1	common/env_common.c     Environment has a bad CRC, using default
 
 
 Modem Support:
diff --git a/common/cmd_immap.c b/common/cmd_immap.c
index 4bb6e0cc49..252bdfb1e8 100644
--- a/common/cmd_immap.c
+++ b/common/cmd_immap.c
@@ -634,7 +634,7 @@ U_BOOT_CMD(
 
 U_BOOT_CMD(
 	iopset,	5,	0,	do_iopset,
-	"iopset - set I/O Port registers\n",
+	"iopset  - set I/O Port registers\n",
 	"PORT PIN CMD VALUE\nPORT: A-D, PIN: 0-31, CMD: [dat|dir|odr|sor], VALUE: 0|1"
 );
 
diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index 3335a14067..7b6faf79c5 100644
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -133,7 +133,7 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
 	sspi,	5,	1,	do_spi,
-	"sspi     - SPI utility commands\n",
+	"sspi    - SPI utility commands\n",
 	"<device> <bit_len> <dout> - Send <bit_len> bits from <dout> out the SPI\n"
 	"<device>  - Identifies the chip select of the device\n"
 	"<bit_len> - Number of bits to send (base 10)\n"
diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 1822fbc224..82a8de9788 100644
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -196,6 +196,7 @@
 
 #ifdef	CONFIG_ETHER_ON_FCC
 #define CONFIG_ETHER_INDEX	2	/* which SCC/FCC channel for ethernet */
+#undef	CONFIG_ETHER_LOOPBACK_TEST	/* Ethernet external loopback test */
 #define CONFIG_MII			/* MII PHY management		*/
 #define CONFIG_BITBANGMII		/* bit-bang MII PHY management	*/
 /*
@@ -351,38 +352,39 @@
  *
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"serverip=192.168.123.201\0" \
-	"ipaddr=192.168.123.203\0" \
+	"serverip=192.168.123.205\0\0" \
+	"ipaddr=192.168.123.213\0" \
 	"reprog="\
-		"tftpboot 0x140000 /bdi2000/u-boot.bin; " \
-		"protect off 1:0; " \
-		"erase 1:0; " \
-		"cp.b 140000 40000000 $(filesize); " \
+		"bootp;" \
+		"tftpboot 0x140000 /bdi2000/u-boot.bin;" \
+		"protect off 1:0;" \
+		"erase 1:0;" \
+		"cp.b 140000 40000000 $(filesize);" \
 		"protect on 1:0\0" \
 	"zapenv="\
-		"protect off 1:1; " \
-		"erase 1:1; " \
+		"protect off 1:1;" \
+		"erase 1:1;" \
 		"protect on 1:1\0" \
 	"root-on-initrd="\
 		"setenv bootcmd "\
-		"version\\;" \
-		"echo\\;" \
-		"bootp\\;" \
+		"version;" \
+		"echo;" \
+		"bootp;" \
 		"setenv bootargs root=/dev/ram0 rw " \
-		"ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
-		"run boot-hook\\;" \
+		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+		"run boot-hook;" \
 		"bootm\0" \
 	"root-on-nfs="\
 		"setenv bootcmd "\
-		"version\\;" \
-		"echo\\;" \
-		"bootp\\;" \
+		"version;" \
+		"echo;" \
+		"bootp;" \
 		"setenv bootargs root=/dev/nfs rw " \
-		"nfsroot=\\$(serverip):\\$(rootpath) " \
-		"ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
-		"run boot-hook\\;" \
+		"nfsroot=$(serverip):$(rootpath) " \
+		"ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
+		"run boot-hook;" \
 		"bootm\0" \
-	"boot-hook=echo boot-hook\0"
+	"boot-hook=echo\0"
 
 /* Define a command string that is automatically executed when no character
  * is read on the console interface withing "Boot Delay" after reset.
@@ -412,11 +414,14 @@
 
 /* Add support for a few extra bootp options like:
  *	- File size
- *	- DNS
+ *	- DNS (up to 2 servers)
+ *	- Send hostname to DHCP server
  */
 #define CONFIG_BOOTP_MASK	(CONFIG_BOOTP_DEFAULT | \
 				 CONFIG_BOOTP_BOOTFILESIZE | \
-				 CONFIG_BOOTP_DNS)
+				 CONFIG_BOOTP_DNS | \ 
+				 CONFIG_BOOTP_DNS2 | \
+				 CONFIG_BOOTP_SEND_HOSTNAME)
 
 /* undef this to save memory */
 #define CFG_LONGHELP
@@ -434,28 +439,37 @@
  */
 #define CONFIG_TIMESTAMP
 
+/* If this variable is defined, an environment variable named "ver"
+ * is created by U-Boot showing the U-Boot version.
+ */
+#define CONFIG_VERSION_VARIABLE
+
 /* What U-Boot subsytems do you want enabled? */
 #ifdef CONFIG_ETHER_ON_FCC
 # define CONFIG_COMMANDS	(((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
-				CFG_CMD_ELF	| \
 				CFG_CMD_ASKENV	| \
 				CFG_CMD_ECHO	| \
+				CFG_CMD_ELF	| \
 				CFG_CMD_I2C	| \
-				CFG_CMD_SDRAM   | \
-				CFG_CMD_REGINFO | \
 				CFG_CMD_IMMAP	| \
-				CFG_CMD_MII	)
+				CFG_CMD_MII	| \
+				CFG_CMD_PING	| \
+				CFG_CMD_REGINFO | \
+				CFG_CMD_SDRAM   )
 #else
 # define CONFIG_COMMANDS	(((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
-				CFG_CMD_ELF	| \
 				CFG_CMD_ASKENV	| \
 				CFG_CMD_ECHO	| \
+				CFG_CMD_ELF	| \
 				CFG_CMD_I2C	| \
-				CFG_CMD_SDRAM   | \
+				CFG_CMD_IMMAP	| \
+				CFG_CMD_PING	| \
 				CFG_CMD_REGINFO | \
-				CFG_CMD_IMMAP	)
+				CFG_CMD_SDRAM   )
 #endif /* CONFIG_ETHER_ON_FCC */
 
+#undef CONFIG_WATCHDOG				/* disable the watchdog */
+
 /* Where do the internal registers live? */
 #define CFG_IMMR		0xF0000000
 
@@ -670,12 +684,22 @@
  *-----------------------------------------------------------------------
  * Watchdog & Bus Monitor Timer max, 60x Bus Monitor enable
  */
+#if defined(CONFIG_WATCHDOG)
+#define CFG_SYPCR	(SYPCR_SWTC |\
+			 SYPCR_BMT  |\
+			 SYPCR_PBME |\
+			 SYPCR_LBME |\
+			 SYPCR_SWRI |\
+			 SYPCR_SWP  |\
+			 SYPCR_SWE)
+#else
 #define CFG_SYPCR	(SYPCR_SWTC |\
 			 SYPCR_BMT  |\
 			 SYPCR_PBME |\
 			 SYPCR_LBME |\
 			 SYPCR_SWRI |\
 			 SYPCR_SWP)
+#endif	/* CONFIG_WATCHDOG */
 
 /*-----------------------------------------------------------------------
  * TMCNTSC - Time Counter Status and Control			 4-40