Merge commit 'wd/master'

16 files changed, 40 insertions, 34 deletions

diff --git a/doc/README-i386 b/doc/README-i386
index 02b753c..c560d22 100644
--- a/doc/README-i386
+++ b/doc/README-i386
@@ -57,9 +57,9 @@ Daniel Engström, Omicron Ceti AB, daniel@omicron.se
 --- linux-2.4.19-orig/init/do_mounts.c	Sat Aug  3 02:39:46 2002
 +++ linux-2.4.19/init/do_mounts.c	Mon Sep 23 16:21:33 2002
 @@ -224,6 +224,14 @@
- 	{ "ftlc", 0x2c10 },
- 	{ "ftld", 0x2c18 },
- 	{ "mtdblock", 0x1f00 },
+	{ "ftlc", 0x2c10 },
+	{ "ftld", 0x2c18 },
+	{ "mtdblock", 0x1f00 },
 +	{ "mtdblock0", 0x1f00 },
 +	{ "mtdblock1", 0x1f01 },
 +	{ "mtdblock2", 0x1f02 },
@@ -68,7 +68,7 @@ Daniel Engström, Omicron Ceti AB, daniel@omicron.se
 +	{ "mtdblock5", 0x1f05 },
 +	{ "mtdblock6", 0x1f06 },
 +	{ "mtdblock7", 0x1f07 },
- 	{ NULL, 0 }
+	{ NULL, 0 }
  };
 
 -------------------
diff --git a/doc/README-integrator b/doc/README-integrator
index ce8a9d2..4daf341 100644
--- a/doc/README-integrator
+++ b/doc/README-integrator
@@ -86,12 +86,12 @@ using the generic "arm_intcm" core:
 ap966_config			Integrator Core Module for ARM966E-S TM
 ap922_config			Integrator Core Module for ARM922T TM with ETM
 ap922_XA10_config		Integrator Core Module for ARM922T using Altera Excalibur
-ap7_config	       		** CM7TDMI
+ap7_config			** CM7TDMI
 integratorap_config
 ap_config
 
 
-cp966_config  			Integrator Core Module for ARM966E-S TM
+cp966_config			Integrator Core Module for ARM966E-S TM
 cp922_config			Integrator Core Module for ARM922T TM with ETM
 cp922_XA10_config		Integrator Core Module for ARM922T using Altera Excalibur
 cp1026_config			Integrator Core Module ARM1026EJ-S TM
diff --git a/doc/README.RPXlite b/doc/README.RPXlite
index c8ccc41..c0238ae 100644
--- a/doc/README.RPXlite
+++ b/doc/README.RPXlite
@@ -451,7 +451,7 @@ reg_config.txt:
 	PS   = 00
 	PARE = 0
 	WP   = 0
-	MS   = 1 				/* UPMA */
+	MS   = 1				/* UPMA */
 	V    = 1				/* Valid */
 
 	=> 0x0000 0081
@@ -486,7 +486,7 @@ reg_config.txt:
 	PS   = 00
 	PARE = 0
 	WP   = 0
-	MS   = 0 				/* GPCM */
+	MS   = 0				/* GPCM */
 	V    = 1				/* Valid */
 
 	=> 0xFA40 0001
@@ -513,7 +513,7 @@ reg_config.txt:
 	PS   = 01
 	PARE = 0
 	WP   = 0
-	MS   = 0 				/* GPCM */
+	MS   = 0				/* GPCM */
 	V    = 1				/* Valid */
 
 	=> 0xFA00 0401
diff --git a/doc/README.adnpesc1 b/doc/README.adnpesc1
index ded5321..5257f18 100644
--- a/doc/README.adnpesc1
+++ b/doc/README.adnpesc1
@@ -184,7 +184,7 @@ you have to check-up the next environment variables:
 	- default is '0' (zero)
 
 	  NOTE:	You should avoid to save this variable with non zero
-	  	value to Flash. Otherwise it would be allow any
+		value to Flash. Otherwise it would be allow any
 		update process at any time!
 
 2. appl_entry_addr
diff --git a/doc/README.adnpesc1_base32 b/doc/README.adnpesc1_base32
index 6576044..145e8cd 100644
--- a/doc/README.adnpesc1_base32
+++ b/doc/README.adnpesc1_base32
@@ -192,7 +192,7 @@ IDE:	(TODO)
 	       :	      gap	       :
 	       |			       |
   0x00010020 ---32-----------16|15------------0-
-  	       |			       | \
+	       |			       | \
 	       |  register bank		       | |
 	       |   size = (real_size << 1)     | |
 	       |   real_size = 0x10	       | |
@@ -308,7 +308,7 @@ IDE:	(TODO)
 	+ 0x18 |- - - - - - - - - - - - - - - -| |
 	       |  slaveselect (1 bit)	 (rw)  | |
 	+ 0x14 |- - - - - - - - - - - - - - - -| |
-  SPI0	       |  		   (reserved)  | |
+  SPI0	       |		   (reserved)  | |
   [4]	+ 0x10 |- - - - - - - - - - - - - - - -|  > 0x00000020
 	       |  control (11 bit)	 (rw)  | |
 	+ 0x0c |- - - - - - - - - - - - - - - -| |
diff --git a/doc/README.console b/doc/README.console
index 6d477df..25c4f1d 100644
--- a/doc/README.console
+++ b/doc/README.console
@@ -97,8 +97,8 @@ SUPPORTED DRIVERS
 
 Working drivers:
 
-    serial 	(architecture dependent serial stuff)
-    video 	(mpc8xx video controller)
+    serial	(architecture dependent serial stuff)
+    video	(mpc8xx video controller)
 
 Work in progress:
 
@@ -114,5 +114,5 @@ TESTED CONFIGURATIONS
 The driver has been tested with the following configurations (see
 CREDITS for other contact informations):
 
-- MPC823FADS with AD7176 on a PAL TV (YCbYCr) 	- arsenio@tin.it
+- MPC823FADS with AD7176 on a PAL TV (YCbYCr)	- arsenio@tin.it
 - GENIETV    with AD7177 on a PAL TV (YCbYCr)	- arsenio@tin.it
diff --git a/doc/README.generic_usb_ohci b/doc/README.generic_usb_ohci
index c44c501..147ea51 100644
--- a/doc/README.generic_usb_ohci
+++ b/doc/README.generic_usb_ohci
@@ -51,6 +51,12 @@ You'll need to define
 
 	CONFIG_PCI_OHCI
 
+If you have several USB PCI controllers, define
+
+	CONFIG_PCI_OHCI_DEVNO: number of the OHCI device in PCI list
+
+If undefined, the first instance found in PCI space will be used.
+
 PCI Controllers need to do byte swapping on register accesses, so they
 should to define:
 
diff --git a/doc/README.m54455evb b/doc/README.m54455evb
index 119a19d..5c01f0d 100644
--- a/doc/README.m54455evb
+++ b/doc/README.m54455evb
@@ -83,7 +83,7 @@ CONFIG_CMD_DATE		-- enable to use date feature in u-boot
 CONFIG_MCFFEC		-- define to use common CF FEC driver
 CONFIG_NET_MULTI	-- define to use multi FEC in u-boot
 CONFIG_MII		-- enable to use MII driver
-CONFIG_CF_DOMII 	-- enable to use MII feature in cmd_mii.c
+CONFIG_CF_DOMII		-- enable to use MII feature in cmd_mii.c
 CFG_DISCOVER_PHY	-- enable PHY discovery
 CFG_RX_ETH_BUFFER	-- Set FEC Receive buffer
 CFG_FAULT_ECHO_LINK_DOWN--
@@ -107,7 +107,7 @@ CFG_ATA_IDE0_OFFSET	-- define ATA IDE0 offset
 CFG_ATA_DATA_OFFSET	-- define ATA data IO
 CFG_ATA_REG_OFFSET	-- define for normal register accesses
 CFG_ATA_ALT_OFFSET	-- define for alternate registers
-CFG_ATA_STRIDE      	-- define for Interval between registers
+CFG_ATA_STRIDE		-- define for Interval between registers
 _IO_BASE		-- define for IO base address
 
 CONFIG_MCFTMR		-- define to use DMA timer
diff --git a/doc/README.m68k b/doc/README.m68k
index 6dea2b5..0c533f3 100644
--- a/doc/README.m68k
+++ b/doc/README.m68k
@@ -4,9 +4,9 @@ U-Boot for Motorola M68K
 ====================================================================
 History
 
-August 08,2005; 	Jens Scharsig <esw@bus-elektronik.de>
+August 08,2005;		Jens Scharsig <esw@bus-elektronik.de>
 			MCF5282 implementation without preloader
-January 12, 2004; 	<josef.baumgartner@telex.de>
+January 12, 2004;	<josef.baumgartner@telex.de>
 ====================================================================
 
 This file contains status information for the port of U-Boot to the
@@ -82,8 +82,8 @@ Board specific code is located in: board/bus/EB+MCF-EV123
 
 To configure the board, type:
 
-make EB+MCF-EV123_config 		for external FLASH
-make EB+MCF-EV123_internal_config 	for internal FLASH
+make EB+MCF-EV123_config		for external FLASH
+make EB+MCF-EV123_internal_config	for internal FLASH
 
 
 4. CONFIGURATION OPTIONS/SETTINGS
@@ -149,7 +149,7 @@ CFG_RFD		-- defines the PLL Reduce Frecuency Devider
 CFG_CSx_BASE	-- defines the base address of chip select x
 CFG_CSx_SIZE	-- defines the memory size (address range) of chip select x
 CFG_CSx_WIDTH	-- defines the bus with of chip select x
-CFG_CSx_RO 	-- if set to 0 chip select x is read/wirte
+CFG_CSx_RO	-- if set to 0 chip select x is read/wirte
 			else chipselct is read only
 CFG_CSx_WS	-- defines the number of wait states  of chip select x
 
diff --git a/doc/README.marubun-pcmcia b/doc/README.marubun-pcmcia
index 3ed5cd3..6099da2 100644
--- a/doc/README.marubun-pcmcia
+++ b/doc/README.marubun-pcmcia
@@ -19,7 +19,7 @@ U-Boot MARUBUN MR-SHPC-01 PCMCIA controller driver
 
 1. base source code
     The code is based on sources from the Linux kernel
-    	( arch/sh/kernel/cf-enabler.c ).
+	( arch/sh/kernel/cf-enabler.c ).
 
 2. How to use
     The options you have to specify in the config file are (with the
@@ -27,14 +27,14 @@ U-Boot MARUBUN MR-SHPC-01 PCMCIA controller driver
 
     * CONFIG_MARUBUN_PCCARD
 	If you want to use this device driver, should define CONFIG_MARUBUN_PCCARD.
-	ex. 	#define CONFIG_MARUBUN_PCCARD
+	ex.	#define CONFIG_MARUBUN_PCCARD
 
     * CONFIG_PCMCIA_SLOT_A
-    	Most devices have only one slot. You should define CONFIG_PCMCIA_SLOT_A .
+	Most devices have only one slot. You should define CONFIG_PCMCIA_SLOT_A .
 	ex.	#define CONFIG_PCMCIA_SLOT_A    1
 
     * CFG_MARUBUN_MRSHPC
-    	This is MR-SHPC-01 PCMCIA controler base address.
+	This is MR-SHPC-01 PCMCIA controler base address.
 	You should do the setting matched to your environment.
 	ex.  #define CFG_MARUBUN_MRSHPC 0xb03fffe0
 	     ( for MS7722SE01 environment )
diff --git a/doc/README.mpc8313erdb b/doc/README.mpc8313erdb
index 21580f9..cd56689 100644
--- a/doc/README.mpc8313erdb
+++ b/doc/README.mpc8313erdb
@@ -22,7 +22,7 @@ Freescale MPC8313ERDB Board
 	0x8000_0000	0x8fff_ffff	PCI MEM		 256M
 	0x9000_0000	0x9fff_ffff	PCI_MMIO	 256M
 	0xe000_0000	0xe00f_ffff	IMMR		 1M
-	0xe200_0000	0xe20f_ffff	PCI IO	 	 16M
+	0xe200_0000	0xe20f_ffff	PCI IO		 16M
 	0xe280_0000	0xe280_7fff	NAND FLASH (CS1) 32K
 	0xf000_0000	0xf001_ffff	VSC7385 (CS2)	 128K
 	0xfa00_0000	0xfa00_7fff	Board Status/	 32K
diff --git a/doc/README.mpc8349itx b/doc/README.mpc8349itx
index 4ae03ae..7f24623 100644
--- a/doc/README.mpc8349itx
+++ b/doc/README.mpc8349itx
@@ -17,7 +17,7 @@ Freescale MPC8349E-mITX and MPC8349E-mITX-GP Boards
 
 2.	Board Switches and Jumpers
 
-2.0 	Descriptions for all of the board jumpers can be found in the User
+2.0	Descriptions for all of the board jumpers can be found in the User
 	Guide.  Of particular interest to U-Boot developers is jumper J22:
 
 	Pos.	Name		Default		Description
@@ -88,8 +88,8 @@ Freescale MPC8349E-mITX and MPC8349E-mITX-GP Boards
 
 	include/configs/MPC8349ITX.h
 
-	CONFIG_MPC83XX	    	MPC83xx family
-	CONFIG_MPC8349	    	MPC8349 specific
+	CONFIG_MPC83XX		MPC83xx family
+	CONFIG_MPC8349		MPC8349 specific
 	CONFIG_MPC8349ITX		MPC8349E-mITX
 	CONFIG_MPC8349ITXGP		MPC8349E-mITX-GP
 
diff --git a/doc/README.mpc8360emds b/doc/README.mpc8360emds
index 5f20247..7c841ce 100644
--- a/doc/README.mpc8360emds
+++ b/doc/README.mpc8360emds
@@ -1,7 +1,7 @@
 Freescale MPC8360EMDS Board
 -----------------------------------------
 1.	Board Switches and Jumpers
-1.0 	There are four Dual-In-Line Packages(DIP) Switches on MPC8360EMDS board
+1.0	There are four Dual-In-Line Packages(DIP) Switches on MPC8360EMDS board
 	For some reason, the HW designers describe the switch settings
 	in terms of 0 and 1, and then map that to physical switches where
 	the label "On" refers to logic 0 and "Off" is logic 1.
diff --git a/doc/README.mpc837xemds b/doc/README.mpc837xemds
index 7823595..a14da0f 100644
--- a/doc/README.mpc837xemds
+++ b/doc/README.mpc837xemds
@@ -1,7 +1,7 @@
 Freescale MPC837xEMDS Board
 -----------------------------------------
 1.	Board Switches and Jumpers
-1.0 	There are four Dual-In-Line Packages(DIP) Switches on MPC837xEMDS board
+1.0	There are four Dual-In-Line Packages(DIP) Switches on MPC837xEMDS board
 	For some reason, the HW designers describe the switch settings
 	in terms of 0 and 1, and then map that to physical switches where
 	the label "On" refers to logic 0 and "Off" is logic 1.
diff --git a/doc/README.mpc8641hpcn b/doc/README.mpc8641hpcn
index ac56cca..1c41d77 100644
--- a/doc/README.mpc8641hpcn
+++ b/doc/README.mpc8641hpcn
@@ -55,7 +55,7 @@ Switches:
 							 halves (virtual banks)
 						  0	:: normal
 	SW5(3)	 = 0		CFG_FLASHWP	= 0	:: not protected
-	SW5(4)	 = 0 		CFG_PORTDIV	= 1	:: 2:1 for PD4
+	SW5(4)	 = 0		CFG_PORTDIV	= 1	:: 2:1 for PD4
 							   1:1 for PD6
 	SW5(5-6) = 11		CFG_PIXISOPT	= 11	:: s/w determined
 	SW5(7-8) = 11		CFG_LADOPT	= 11	:: s/w determined
diff --git a/doc/README.video b/doc/README.video
index c145d9b..34e199c 100644
--- a/doc/README.video
+++ b/doc/README.video
@@ -26,5 +26,5 @@ U-Boot MPC8xx video controller driver
 
 The driver has been tested with the following configurations:
 
-- MPC823FADS with AD7176 on a PAL TV (YCbYCr) 	- arsenio@tin.it
+- MPC823FADS with AD7176 on a PAL TV (YCbYCr)	- arsenio@tin.it
 - GENIETV    with AD7177 on a PAL TV (YCbYCr)	- arsenio@tin.it