* Code cleanup:

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

14 files changed, 66 insertions, 74 deletions

diff --git a/include/asm-arm/arch-arm920t/memory.h b/include/asm-arm/arch-arm920t/memory.h
index 8a4e3f8..333f218 100644
--- a/include/asm-arm/arch-arm920t/memory.h
+++ b/include/asm-arm/arch-arm920t/memory.h
@@ -92,17 +92,17 @@ extern unsigned long __phys_to_virt(unsigned long ppage);
 #ifdef CONFIG_DISCONTIGMEM
 #error "CONFIG_DISCONTIGMEM will not work on S3C2400"
 /*
- * Because of the wide memory address space between physical RAM banks on the 
+ * Because of the wide memory address space between physical RAM banks on the
  * SA1100, it's much more convenient to use Linux's NUMA support to implement
- * our memory map representation.  Assuming all memory nodes have equal access 
+ * our memory map representation.  Assuming all memory nodes have equal access
  * characteristics, we then have generic discontiguous memory support.
  *
  * Of course, all this isn't mandatory for SA1100 implementations with only
  * one used memory bank.  For those, simply undefine CONFIG_DISCONTIGMEM.
  *
- * The nodes are matched with the physical memory bank addresses which are 
+ * The nodes are matched with the physical memory bank addresses which are
  * incidentally the same as virtual addresses.
- * 
+ *
  * 	node 0:  0xc0000000 - 0xc7ffffff
  * 	node 1:  0xc8000000 - 0xcfffffff
  * 	node 2:  0xd0000000 - 0xd7ffffff
@@ -138,7 +138,7 @@ extern unsigned long __phys_to_virt(unsigned long ppage);
 	(((unsigned long)(kvaddr) & 0x07ffffff) >> PAGE_SHIFT)
 
 /*
- * Given a kaddr, virt_to_page returns a pointer to the corresponding 
+ * Given a kaddr, virt_to_page returns a pointer to the corresponding
  * mem_map entry.
  */
 #define virt_to_page(kaddr) \
diff --git a/include/asm-arm/arch-at91rm9200/AT91RM9200.h b/include/asm-arm/arch-at91rm9200/AT91RM9200.h
index c0e5211..60f1737 100644
--- a/include/asm-arm/arch-at91rm9200/AT91RM9200.h
+++ b/include/asm-arm/arch-at91rm9200/AT91RM9200.h
@@ -21,7 +21,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
  */
- 
+
 #ifndef AT91RM9200_H
 #define AT91RM9200_H
 
@@ -205,13 +205,13 @@ typedef struct _AT91S_PMC {
 	AT91_REG	 PMC_SCER; 	/* System Clock Enable Register */
 	AT91_REG	 PMC_SCDR; 	/* System Clock Disable Register */
 	AT91_REG	 PMC_SCSR; 	/* System Clock Status Register */
-	AT91_REG	 Reserved0[1]; 	/* */ 
+	AT91_REG	 Reserved0[1]; 	/* */
 	AT91_REG	 PMC_PCER; 	/* Peripheral Clock Enable Register */
 	AT91_REG	 PMC_PCDR; 	/* Peripheral Clock Disable Register */
 	AT91_REG	 PMC_PCSR; 	/* Peripheral Clock Status Register */
-	AT91_REG	 Reserved1[5]; 	/* */ 
+	AT91_REG	 Reserved1[5]; 	/* */
 	AT91_REG	 PMC_MCKR; 	/* Master Clock Register */
-	AT91_REG	 Reserved2[3]; 	/* */ 
+	AT91_REG	 Reserved2[3]; 	/* */
 	AT91_REG	 PMC_PCKR[8]; 	/* Programmable Clock Register */
 	AT91_REG	 PMC_IER; 	/* Interrupt Enable Register */
 	AT91_REG	 PMC_IDR; 	/* Interrupt Disable Register */
@@ -281,9 +281,9 @@ typedef struct _AT91S_EMAC {
 #define AT91C_EMAC_BP         ((unsigned int) 0x1 <<  8) /* (EMAC) Back pressure. */
 /* -------- EMAC_CFG : (EMAC Offset: 0x4) Network Configuration Register --------  */
 #define AT91C_EMAC_SPD        ((unsigned int) 0x1 <<  0) /* (EMAC) Speed. */
-#define AT91C_EMAC_FD         ((unsigned int) 0x1 <<  1) /* (EMAC) Full duplex. */ 
+#define AT91C_EMAC_FD         ((unsigned int) 0x1 <<  1) /* (EMAC) Full duplex. */
 #define AT91C_EMAC_BR         ((unsigned int) 0x1 <<  2) /* (EMAC) Bit rate. */
-#define AT91C_EMAC_CAF        ((unsigned int) 0x1 <<  4) /* (EMAC) Copy all frames. */ 
+#define AT91C_EMAC_CAF        ((unsigned int) 0x1 <<  4) /* (EMAC) Copy all frames. */
 #define AT91C_EMAC_NBC        ((unsigned int) 0x1 <<  5) /* (EMAC) No broadcast. */
 #define AT91C_EMAC_MTI        ((unsigned int) 0x1 <<  6) /* (EMAC) Multicast hash enable */
 #define AT91C_EMAC_UNI        ((unsigned int) 0x1 <<  7) /* (EMAC) Unicast hash enable. */
@@ -328,10 +328,10 @@ typedef struct _AT91S_EMAC {
 #define AT91C_EMAC_ROVR       ((unsigned int) 0x1 << 10) /* (EMAC) */
 #define AT91C_EMAC_HRESP      ((unsigned int) 0x1 << 11) /* (EMAC) */
 /* -------- EMAC_IER : (EMAC Offset: 0x28) Interrupt Enable Register -------- */
-/* -------- EMAC_IDR : (EMAC Offset: 0x2c) Interrupt Disable Register -------- */ 
+/* -------- EMAC_IDR : (EMAC Offset: 0x2c) Interrupt Disable Register -------- */
 /* -------- EMAC_IMR : (EMAC Offset: 0x30) Interrupt Mask Register -------- */
 /* -------- EMAC_MAN : (EMAC Offset: 0x34) PHY Maintenance Register -------- */
-#define AT91C_EMAC_DATA       ((unsigned int) 0xFFFF <<  0) /* (EMAC) */ 
+#define AT91C_EMAC_DATA       ((unsigned int) 0xFFFF <<  0) /* (EMAC) */
 #define AT91C_EMAC_CODE       ((unsigned int) 0x3 << 16) /* (EMAC) */
 #define         AT91C_EMAC_CODE_802_3 ((unsigned int) 0x2 << 16) /* (EMAC) Write Operation */
 #define AT91C_EMAC_REGA       ((unsigned int) 0x1F << 18) /* (EMAC) */
@@ -356,7 +356,7 @@ typedef struct _AT91S_SPI {
 	AT91_REG	 SPI_IMR; 	/* Interrupt Mask Register */
 	AT91_REG	 Reserved0[4]; 	/* */
 	AT91_REG	 SPI_CSR[4]; 	/* Chip Select Register */
-	AT91_REG	 Reserved1[48]; /* */ 
+	AT91_REG	 Reserved1[48]; /* */
 	AT91_REG	 SPI_RPR; 	/* Receive Pointer Register */
 	AT91_REG	 SPI_RCR; 	/* Receive Counter Register */
 	AT91_REG	 SPI_TPR; 	/* Transmit Pointer Register */
diff --git a/include/asm-arm/arch-pxa/bitfield.h b/include/asm-arm/arch-pxa/bitfield.h
index f1f0e33..2ac5ea2 100644
--- a/include/asm-arm/arch-pxa/bitfield.h
+++ b/include/asm-arm/arch-pxa/bitfield.h
@@ -11,7 +11,6 @@
  */
 
 
-
 #ifndef __BITFIELD_H
 #define __BITFIELD_H
 
@@ -88,7 +87,7 @@
  */
 
 #define FInsrt(Value, Field) \
-                	(UData (Value) << FShft (Field))
+			(UData (Value) << FShft (Field))
 
 
 /*
@@ -107,7 +106,7 @@
  */
 
 #define FExtr(Data, Field) \
-                	((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
+			((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
 
 
 #endif /* __BITFIELD_H */
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index b84ea48..d40f05e 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -4,7 +4,7 @@
  *  Author:	Nicolas Pitre
  *  Created:	Jun 15, 2001
  *  Copyright:	MontaVista Software Inc.
- *  
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -86,16 +86,16 @@ typedef struct { volatile u32 offset[4096]; } __regbase;
 
 #endif
 #endif /* UBOOT_REG_FIX */
-	
+
 #ifdef UBOOT_REG_FIX
 # undef	io_p2v
 # undef __REG
 # ifndef __ASSEMBLY__
 #  define io_p2v(PhAdd)    (PhAdd)
 #  define __REG(x)	(*((volatile u32 *)io_p2v(x)))
-#  define __REG2(x,y)	(*(volatile u32 *)((u32)&__REG(x) + (y)))	
+#  define __REG2(x,y)	(*(volatile u32 *)((u32)&__REG(x) + (y)))
 # else
-#  define __REG(x) (x)	
+#  define __REG(x) (x)
 #endif /* UBOOT_REG_FIX */
 
 #include "pxa-regs.h"
diff --git a/include/asm-arm/arch-pxa/mmc.h b/include/asm-arm/arch-pxa/mmc.h
index 4d61ade..a62679a 100644
--- a/include/asm-arm/arch-pxa/mmc.h
+++ b/include/asm-arm/arch-pxa/mmc.h
@@ -1,7 +1,7 @@
 /*
- *  linux/drivers/mmc/mmc_pxa.h 
+ *  linux/drivers/mmc/mmc_pxa.h
  *
- *  Author: Vladimir Shebordaev, Igor Oblakov   
+ *  Author: Vladimir Shebordaev, Igor Oblakov
  *  Copyright:  MontaVista Software Inc.
  *
  *  $Id: mmc_pxa.h,v 0.3.1.6 2002/09/25 19:25:48 ted Exp ted $
@@ -76,7 +76,7 @@
 #define MMC_BLK_LEN_MAX	 		(0x03ffUL) /* [9:0] */
 
 /* MMC_PRTBUF */
-#define MMC_PRTBUF_BUF_PART_FULL       	(0x01UL) 
+#define MMC_PRTBUF_BUF_PART_FULL       	(0x01UL)
 #define MMC_PRTBUF_BUF_FULL		(0x00UL    )
 
 /* MMC_I_MASK */
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index 208c110..a59838c 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -63,12 +63,12 @@ typedef void            (*ExcpHndlr) (void) ;
 #define PCMCIA1MemSp	PCMCIAMemSp	/* PCMCIA 1 Memory Space [byte]    */
 
 #define _PCMCIA(Nb)	        	/* PCMCIA [0..1]                   */ \
-                	(0x20000000 + (Nb)*PCMCIASp)
+			(0x20000000 + (Nb)*PCMCIASp)
 #define _PCMCIAIO(Nb)	_PCMCIA (Nb)	/* PCMCIA I/O [0..1]               */
 #define _PCMCIAAttr(Nb)	        	/* PCMCIA Attribute [0..1]         */ \
-                	(_PCMCIA (Nb) + 2*PCMCIAPrtSp)
+			(_PCMCIA (Nb) + 2*PCMCIAPrtSp)
 #define _PCMCIAMem(Nb)	        	/* PCMCIA Memory [0..1]            */ \
-                	(_PCMCIA (Nb) + 3*PCMCIAPrtSp)
+			(_PCMCIA (Nb) + 3*PCMCIAPrtSp)
 
 #define _PCMCIA0	_PCMCIA (0)	/* PCMCIA 0                        */
 #define _PCMCIA0IO	_PCMCIAIO (0)	/* PCMCIA 0 I/O                    */
@@ -81,7 +81,6 @@ typedef void            (*ExcpHndlr) (void) ;
 #define _PCMCIA1Mem	_PCMCIAMem (1)	/* PCMCIA 1 Memory                 */
 
 
-
 /*
  * DMA Controller
  */
@@ -402,18 +401,18 @@ typedef void            (*ExcpHndlr) (void) ;
 #define IrSR_XMITIR_UART_MODE 0x0
 
 #define IrSR_IR_RECEIVE_ON (\
-                IrSR_RXPL_NEG_IS_ZERO | \
-                IrSR_TXPL_POS_IS_ZERO | \
-                IrSR_XMODE_PULSE_3_16 | \
-                IrSR_RCVEIR_IR_MODE   | \
-                IrSR_XMITIR_UART_MODE)
+		IrSR_RXPL_NEG_IS_ZERO | \
+		IrSR_TXPL_POS_IS_ZERO | \
+		IrSR_XMODE_PULSE_3_16 | \
+		IrSR_RCVEIR_IR_MODE   | \
+		IrSR_XMITIR_UART_MODE)
 
 #define IrSR_IR_TRANSMIT_ON (\
-                IrSR_RXPL_NEG_IS_ZERO | \
-                IrSR_TXPL_POS_IS_ZERO | \
-                IrSR_XMODE_PULSE_3_16 | \
-                IrSR_RCVEIR_UART_MODE | \
-                IrSR_XMITIR_IR_MODE)
+		IrSR_RXPL_NEG_IS_ZERO | \
+		IrSR_TXPL_POS_IS_ZERO | \
+		IrSR_XMODE_PULSE_3_16 | \
+		IrSR_RCVEIR_UART_MODE | \
+		IrSR_XMITIR_IR_MODE)
 
 /*
  * I2C registers
@@ -1198,47 +1197,47 @@ typedef void            (*ExcpHndlr) (void) ;
 
 #define LCCR1_PPL       Fld (10, 0)      /* Pixels Per Line - 1 */
 #define LCCR1_DisWdth(Pixel)            /* Display Width [1..800 pix.]  */ \
-                        (((Pixel) - 1) << FShft (LCCR1_PPL))
+			(((Pixel) - 1) << FShft (LCCR1_PPL))
 
 #define LCCR1_HSW       Fld (6, 10)     /* Horizontal Synchronization     */
 #define LCCR1_HorSnchWdth(Tpix)         /* Horizontal Synchronization     */ \
-                                        /* pulse Width [1..64 Tpix]       */ \
-                        (((Tpix) - 1) << FShft (LCCR1_HSW))
+					/* pulse Width [1..64 Tpix]       */ \
+			(((Tpix) - 1) << FShft (LCCR1_HSW))
 
 #define LCCR1_ELW       Fld (8, 16)     /* End-of-Line pixel clock Wait    */
-                                        /* count - 1 [Tpix]                */
+					/* count - 1 [Tpix]                */
 #define LCCR1_EndLnDel(Tpix)            /*  End-of-Line Delay              */ \
-                                        /*  [1..256 Tpix]                  */ \
-                        (((Tpix) - 1) << FShft (LCCR1_ELW))
+					/*  [1..256 Tpix]                  */ \
+			(((Tpix) - 1) << FShft (LCCR1_ELW))
 
 #define LCCR1_BLW       Fld (8, 24)     /* Beginning-of-Line pixel clock   */
-                                        /* Wait count - 1 [Tpix]           */
+					/* Wait count - 1 [Tpix]           */
 #define LCCR1_BegLnDel(Tpix)            /*  Beginning-of-Line Delay        */ \
-                                        /*  [1..256 Tpix]                  */ \
-                        (((Tpix) - 1) << FShft (LCCR1_BLW))
+					/*  [1..256 Tpix]                  */ \
+			(((Tpix) - 1) << FShft (LCCR1_BLW))
 
 
 #define LCCR2_LPP       Fld (10, 0)     /* Line Per Panel - 1              */
 #define LCCR2_DisHght(Line)             /*  Display Height [1..1024 lines] */ \
-                        (((Line) - 1) << FShft (LCCR2_LPP))
+			(((Line) - 1) << FShft (LCCR2_LPP))
 
 #define LCCR2_VSW       Fld (6, 10)     /* Vertical Synchronization pulse  */
-                                        /* Width - 1 [Tln] (L_FCLK)        */
+					/* Width - 1 [Tln] (L_FCLK)        */
 #define LCCR2_VrtSnchWdth(Tln)          /*  Vertical Synchronization pulse */ \
-                                        /*  Width [1..64 Tln]              */ \
-                        (((Tln) - 1) << FShft (LCCR2_VSW))
+					/*  Width [1..64 Tln]              */ \
+			(((Tln) - 1) << FShft (LCCR2_VSW))
 
 #define LCCR2_EFW       Fld (8, 16)     /* End-of-Frame line clock Wait    */
-                                        /* count [Tln]                     */
+					/* count [Tln]                     */
 #define LCCR2_EndFrmDel(Tln)            /*  End-of-Frame Delay             */ \
-                                        /*  [0..255 Tln]                   */ \
-                        ((Tln) << FShft (LCCR2_EFW))
+					/*  [0..255 Tln]                   */ \
+			((Tln) << FShft (LCCR2_EFW))
 
 #define LCCR2_BFW       Fld (8, 24)     /* Beginning-of-Frame line clock   */
-                                        /* Wait count [Tln]                */
+					/* Wait count [Tln]                */
 #define LCCR2_BegFrmDel(Tln)            /*  Beginning-of-Frame Delay       */ \
-                                        /*  [0..255 Tln]                   */ \
-                        ((Tln) << FShft (LCCR2_BFW))
+					/*  [0..255 Tln]                   */ \
+			((Tln) << FShft (LCCR2_BFW))
 
 #if 0
 #define LCCR3_PCD	(0xff)		/* Pixel clock divisor */
@@ -1261,25 +1260,25 @@ typedef void            (*ExcpHndlr) (void) ;
 
 #define LCCR3_PCD       Fld (8, 0)      /* Pixel Clock Divisor */
 #define LCCR3_PixClkDiv(Div)            /* Pixel Clock Divisor */ \
-                        (((Div) << FShft (LCCR3_PCD)))
+			(((Div) << FShft (LCCR3_PCD)))
 
 
 #define LCCR3_BPP       Fld (3, 24)     /* Bit Per Pixel */
 #define LCCR3_Bpp(Bpp)                  /* Bit Per Pixel */ \
-                        (((Bpp) << FShft (LCCR3_BPP)))
+			(((Bpp) << FShft (LCCR3_BPP)))
 
 #define LCCR3_ACB       Fld (8, 8)      /* AC Bias */
 #define LCCR3_Acb(Acb)                  /* BAC Bias */ \
-                        (((Acb) << FShft (LCCR3_ACB)))
+			(((Acb) << FShft (LCCR3_ACB)))
 
 #define LCCR3_HorSnchH  (LCCR3_HSP*0)   /*  Horizontal Synchronization     */
-                                        /*  pulse active High              */
+					/*  pulse active High              */
 #define LCCR3_HorSnchL  (LCCR3_HSP*1)   /*  Horizontal Synchronization     */
 
 #define LCCR3_VrtSnchH  (LCCR3_VSP*0)   /*  Vertical Synchronization pulse */
-                                        /*  active High                    */
+					/*  active High                    */
 #define LCCR3_VrtSnchL  (LCCR3_VSP*1)   /*  Vertical Synchronization pulse */
-                                        /*  active Low                     */
+					/*  active Low                     */
 
 #define LCSR_LDD	(1 << 0)	/* LCD Disable Done */
 #define LCSR_SOF	(1 << 1)	/* Start of frame */
@@ -1338,7 +1337,7 @@ typedef void            (*ExcpHndlr) (void) ;
 #define MDCNFG_DE2	0x00010000
 #define MDCNFG_DE3	0x00020000
 #define MDCNFG_DWID0	0x00000004
-	
+
 #define MDREFR		__REG(0x48000004)  /* SDRAM Refresh Control Register */
 #define MSC0		__REG(0x48000008)  /* Static Memory Control Register 0 */
 #define MSC1		__REG(0x4800000C)  /* Static Memory Control Register 1 */
diff --git a/include/asm-arm/arch-sa1100/bitfield.h b/include/asm-arm/arch-sa1100/bitfield.h
index f1f0e33..2ac5ea2 100644
--- a/include/asm-arm/arch-sa1100/bitfield.h
+++ b/include/asm-arm/arch-sa1100/bitfield.h
@@ -11,7 +11,6 @@
  */
 
 
-
 #ifndef __BITFIELD_H
 #define __BITFIELD_H
 
@@ -88,7 +87,7 @@
  */
 
 #define FInsrt(Value, Field) \
-                	(UData (Value) << FShft (Field))
+			(UData (Value) << FShft (Field))
 
 
 /*
@@ -107,7 +106,7 @@
  */
 
 #define FExtr(Data, Field) \
-                	((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
+			((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
 
 
 #endif /* __BITFIELD_H */
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 4733858..4b8bab2 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -106,7 +106,7 @@ static inline unsigned long ffz(unsigned long word)
 	if (word & 0x0f000000) { k -= 4;  word <<= 4;  }
 	if (word & 0x30000000) { k -= 2;  word <<= 2;  }
 	if (word & 0x40000000) { k -= 1; }
-        return k;
+	return k;
 }
 
 /*
diff --git a/include/asm-arm/byteorder.h b/include/asm-arm/byteorder.h
index d648a19..c3489f1 100644
--- a/include/asm-arm/byteorder.h
+++ b/include/asm-arm/byteorder.h
@@ -30,4 +30,3 @@
 #endif
 
 #endif
-
diff --git a/include/asm-arm/proc-armv/ptrace.h b/include/asm-arm/proc-armv/ptrace.h
index 51708b9..79cc644 100644
--- a/include/asm-arm/proc-armv/ptrace.h
+++ b/include/asm-arm/proc-armv/ptrace.h
@@ -107,4 +107,3 @@ static inline int valid_user_regs(struct pt_regs *regs)
 #endif	/* __ASSEMBLY__ */
 
 #endif
-
diff --git a/include/asm-arm/proc-armv/system.h b/include/asm-arm/proc-armv/system.h
index 479f553..e7b0fe6 100644
--- a/include/asm-arm/proc-armv/system.h
+++ b/include/asm-arm/proc-armv/system.h
@@ -56,7 +56,7 @@ extern unsigned long cr_alignment;	/* defined in entry-armv.S */
 	:							\
 	: "memory");						\
 	})
-	
+
 /*
  * Enable IRQs
  */
diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
index 0e4482b..73c9087 100644
--- a/include/asm-arm/ptrace.h
+++ b/include/asm-arm/ptrace.h
@@ -31,4 +31,3 @@ extern void show_regs(struct pt_regs *);
 #endif /* __ASSEMBLY__ */
 
 #endif
-
diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index c20b448..89df4dc 100644
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -76,7 +76,6 @@ struct param_struct {
 };
 
 
-
 /*
  * The new way of passing information: a list of tagged entries
  */
diff --git a/include/asm-arm/types.h b/include/asm-arm/types.h
index 39d5290..13e9806 100644
--- a/include/asm-arm/types.h
+++ b/include/asm-arm/types.h
@@ -48,4 +48,3 @@ typedef u32 dma_addr_t;
 #endif /* __KERNEL__ */
 
 #endif
-