* 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 Jon Diekema, 17 Sep 2003:
- update README (SHOW_BOOT_PROGRESS values for cmd_nand.c and env_common.c) - sbc8260 tweaks - adjust "help" output
wdenk
1 parent 5f535fe170
Showing 5 changed files with 71 additions and 32 deletions Side-by-side Diff
CHANGELOG
README
common/cmd_immap.c
common/cmd_spi.c
include/configs/sbc8260.h
@@ -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
@@ -1416,7 +1416,13 @@
    -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:
@@ -634,7 +634,7 @@
  
 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"
 );
  
@@ -133,7 +133,7 @@
  
 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"
@@ -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
...	...	@@ -2,6 +2,15 @@
2	2	Changes for U-Boot 1.0.0:
3	3	======================================================================
4	4
	5	+* Patch by Rune Torgersen, 17 Sep 2003:
	6	+ - Fixes for MPC8266 default config
	7	+
	8	+* Patches by Jon Diekema, 17 Sep 2003:
	9	+ - update README (SHOW_BOOT_PROGRESS values for cmd_nand.c and
	10	+ env_common.c)
	11	+ - sbc8260 tweaks
	12	+ - adjust "help" output
	13	+
5	14	* Patches by Anders Larsen, 17 Sep 2003:
6	15	- fix spelling errors
7	16	- set GD_FLG_DEVINIT flag only after device function pointers
...	...	@@ -1416,7 +1416,13 @@
1416	1416	-1 common/cmd_ide.c Read Error on boot device
1417	1417	-1 common/cmd_ide.c Image header has bad magic number
1418	1418
1419		- -1 common/cmd_nvedit.c Environment not changable, but has bad CRC
	1419	+ -1 common/cmd_nand.c Bad usage of "nand" command
	1420	+ -1 common/cmd_nand.c No boot device
	1421	+ -1 common/cmd_nand.c Unknown Chip ID on boot device
	1422	+ -1 common/cmd_nand.c Read Error on boot device
	1423	+ -1 common/cmd_nand.c Image header has bad magic number
	1424	+
	1425	+ -1 common/env_common.c Environment has a bad CRC, using default
1420	1426
1421	1427
1422	1428	Modem Support:
...	...	@@ -634,7 +634,7 @@
634	634
635	635	U_BOOT_CMD(
636	636	iopset, 5, 0, do_iopset,
637		- "iopset - set I/O Port registers\n",
	637	+ "iopset - set I/O Port registers\n",
638	638	"PORT PIN CMD VALUE\nPORT: A-D, PIN: 0-31, CMD: [dat\|dir\|odr\|sor], VALUE: 0\|1"
639	639	);
640	640
...	...	@@ -133,7 +133,7 @@
133	133
134	134	U_BOOT_CMD(
135	135	sspi, 5, 1, do_spi,
136		- "sspi - SPI utility commands\n",
	136	+ "sspi - SPI utility commands\n",
137	137	"<device> <bit_len> <dout> - Send <bit_len> bits from <dout> out the SPI\n"
138	138	"<device> - Identifies the chip select of the device\n"
139	139	"<bit_len> - Number of bits to send (base 10)\n"
...	...	@@ -196,6 +196,7 @@
196	196
197	197	#ifdef CONFIG_ETHER_ON_FCC
198	198	#define CONFIG_ETHER_INDEX 2 /* which SCC/FCC channel for ethernet */
	199	+#undef CONFIG_ETHER_LOOPBACK_TEST /* Ethernet external loopback test */
199	200	#define CONFIG_MII /* MII PHY management */
200	201	#define CONFIG_BITBANGMII /* bit-bang MII PHY management */
201	202	/*
202	203
203	204
204	205
205	206
206	207
207	208
208	209
...	...	@@ -351,38 +352,39 @@
351	352	*
352	353	*/
353	354	#define CONFIG_EXTRA_ENV_SETTINGS \
354		- "serverip=192.168.123.201\0" \
355		- "ipaddr=192.168.123.203\0" \
	355	+ "serverip=192.168.123.205\0\0" \
	356	+ "ipaddr=192.168.123.213\0" \
356	357	"reprog="\
357		- "tftpboot 0x140000 /bdi2000/u-boot.bin; " \
358		- "protect off 1:0; " \
359		- "erase 1:0; " \
360		- "cp.b 140000 40000000 $(filesize); " \
	358	+ "bootp;" \
	359	+ "tftpboot 0x140000 /bdi2000/u-boot.bin;" \
	360	+ "protect off 1:0;" \
	361	+ "erase 1:0;" \
	362	+ "cp.b 140000 40000000 $(filesize);" \
361	363	"protect on 1:0\0" \
362	364	"zapenv="\
363		- "protect off 1:1; " \
364		- "erase 1:1; " \
	365	+ "protect off 1:1;" \
	366	+ "erase 1:1;" \
365	367	"protect on 1:1\0" \
366	368	"root-on-initrd="\
367	369	"setenv bootcmd "\
368		- "version\\;" \
369		- "echo\\;" \
370		- "bootp\\;" \
	370	+ "version;" \
	371	+ "echo;" \
	372	+ "bootp;" \
371	373	"setenv bootargs root=/dev/ram0 rw " \
372		- "ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
373		- "run boot-hook\\;" \
	374	+ "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
	375	+ "run boot-hook;" \
374	376	"bootm\0" \
375	377	"root-on-nfs="\
376	378	"setenv bootcmd "\
377		- "version\\;" \
378		- "echo\\;" \
379		- "bootp\\;" \
	379	+ "version;" \
	380	+ "echo;" \
	381	+ "bootp;" \
380	382	"setenv bootargs root=/dev/nfs rw " \
381		- "nfsroot=\\$(serverip):\\$(rootpath) " \
382		- "ip=\\$(ipaddr):\\$(serverip):\\$(gatewayip):\\$(netmask):\\$(hostname)::off\\;" \
383		- "run boot-hook\\;" \
	383	+ "nfsroot=$(serverip):$(rootpath) " \
	384	+ "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;" \
	385	+ "run boot-hook;" \
384	386	"bootm\0" \
385		- "boot-hook=echo boot-hook\0""
	387	+ "boot-hook=echo\0""
386	388
387	389	/* Define a command string that is automatically executed when no character
388	390	* is read on the console interface withing "Boot Delay" after reset.
389	391
...	...	@@ -412,11 +414,14 @@
412	414
413	415	/* Add support for a few extra bootp options like:
414	416	* - File size
415		- * - DNS
	417	+ * - DNS (up to 2 servers)
	418	+ * - Send hostname to DHCP server
416	419	*/
417	420	#define CONFIG_BOOTP_MASK (CONFIG_BOOTP_DEFAULT \| \
418	421	CONFIG_BOOTP_BOOTFILESIZE \| \
419		- CONFIG_BOOTP_DNS)
	422	+ CONFIG_BOOTP_DNS \| \
	423	+ CONFIG_BOOTP_DNS2 \| \
	424	+ CONFIG_BOOTP_SEND_HOSTNAME)
420	425
421	426	/* undef this to save memory */
422	427	#define CFG_LONGHELP
423	428
424	429
425	430
426	431
427	432
428	433
429	434
430	435
431	436
...	...	@@ -434,28 +439,37 @@
434	439	*/
435	440	#define CONFIG_TIMESTAMP
436	441
	442	+/* If this variable is defined, an environment variable named "ver"
	443	+ * is created by U-Boot showing the U-Boot version.
	444	+ */
	445	+#define CONFIG_VERSION_VARIABLE
	446	+
437	447	/* What U-Boot subsytems do you want enabled? */
438	448	#ifdef CONFIG_ETHER_ON_FCC
439	449	# define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) \| \
440		- CFG_CMD_ELF \| \
441	450	CFG_CMD_ASKENV \| \
442	451	CFG_CMD_ECHO \| \
	452	+ CFG_CMD_ELF \| \
443	453	CFG_CMD_I2C \| \
444		- CFG_CMD_SDRAM \| \
445		- CFG_CMD_REGINFO \| \
446	454	CFG_CMD_IMMAP \| \
447		- CFG_CMD_MII )
	455	+ CFG_CMD_MII \| \
	456	+ CFG_CMD_PING \| \
	457	+ CFG_CMD_REGINFO \| \
	458	+ CFG_CMD_SDRAM )
448	459	#else
449	460	# define CONFIG_COMMANDS (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) \| \
450		- CFG_CMD_ELF \| \
451	461	CFG_CMD_ASKENV \| \
452	462	CFG_CMD_ECHO \| \
	463	+ CFG_CMD_ELF \| \
453	464	CFG_CMD_I2C \| \
454		- CFG_CMD_SDRAM \| \
	465	+ CFG_CMD_IMMAP \| \
	466	+ CFG_CMD_PING \| \
455	467	CFG_CMD_REGINFO \| \
456		- CFG_CMD_IMMAP )
	468	+ CFG_CMD_SDRAM )
457	469	#endif /* CONFIG_ETHER_ON_FCC */
458	470
	471	+#undef CONFIG_WATCHDOG /* disable the watchdog */
	472	+
459	473	/* Where do the internal registers live? */
460	474	#define CFG_IMMR 0xF0000000
461	475
462	476
463	477
...	...	@@ -670,12 +684,22 @@
670	684	*-----------------------------------------------------------------------
671	685	* Watchdog & Bus Monitor Timer max, 60x Bus Monitor enable
672	686	*/
	687	+#if defined(CONFIG_WATCHDOG)
673	688	#define CFG_SYPCR (SYPCR_SWTC \|\
674	689	SYPCR_BMT \|\
675	690	SYPCR_PBME \|\
676	691	SYPCR_LBME \|\
677	692	SYPCR_SWRI \|\
	693	+ SYPCR_SWP \|\
	694	+ SYPCR_SWE)
	695	+#else
	696	+#define CFG_SYPCR (SYPCR_SWTC \|\
	697	+ SYPCR_BMT \|\
	698	+ SYPCR_PBME \|\
	699	+ SYPCR_LBME \|\
	700	+ SYPCR_SWRI \|\
678	701	SYPCR_SWP)
	702	+#endif /* CONFIG_WATCHDOG */
679	703
680	704	/*-----------------------------------------------------------------------
681	705	* TMCNTSC - Time Counter Status and Control 4-40