* Fix mdelay() on TRAB - this was still the debugging version with

  seconds instead of ms.

* Patch by Robert Schwebel, 1 Nov 2002:
  XScale related cleanup (affects all ARM boards)

* Cleanup of names, warnings and README.

17 files changed, 40 insertions, 31 deletions

diff --git a/common/cmd_autoscript.c b/common/cmd_autoscript.c
index 49bd463f6..7e706c93a 100644
--- a/common/cmd_autoscript.c
+++ b/common/cmd_autoscript.c
@@ -106,7 +106,7 @@ autoscript (ulong addr)
 		return 1;
 	}
 
-	debug ("** Script length: %d\n", len);
+	debug ("** Script length: %ld\n", len);
 
 	if ((cmd = malloc (len + 1)) == NULL) {
 		return 1;
diff --git a/cpu/xscale/start.S b/cpu/xscale/start.S
index f1049a8f5..6cc7c43db 100644
--- a/cpu/xscale/start.S
+++ b/cpu/xscale/start.S
@@ -96,7 +96,7 @@ _armboot_real_end:
  */
 .globl _uboot_reloc
 _uboot_reloc:
-	.word CFG_DRAM_BASE + CFG_DRAM_SIZE - CFG_MONITOR_LEN
+	.word TEXT_BASE
 
 #ifdef CONFIG_USE_IRQ
 /* IRQ stack memory (calculated at run-time) */
@@ -130,7 +130,6 @@ relocate:				/* relocate U-Boot to RAM          */
 	ldr	r2, _armboot_start
 	ldr	r3, _armboot_end
 	sub	r2, r3, r2		/* r2 <- size of armboot */
-/*	ldr	r1, _uboot_reloc	/ * r1 <- destination address        */
 	ldr	r1, _TEXT_BASE
 	add	r2, r0, r2		/* r2 <- source end address */
 
@@ -176,7 +175,7 @@ cpuspeed:	.word   CFG_CPUSPEED
 
 	/* RS: ???                                                          */
 	.macro CPWAIT
-    mrc  p15,0,r0,c2,c0,0
+	mrc  p15,0,r0,c2,c0,0
 	mov  r0,r0
 	sub  pc,pc,#4
 	.endm
@@ -207,23 +206,23 @@ cpu_init_crit:
 
 	ldr	r0, =0x2001		/* enable access to all coproc.     */
 	mcr	p15, 0, r0, c15, c1, 0
-    CPWAIT
+	CPWAIT
 
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write & fill buffers   */
-    CPWAIT
+	CPWAIT
 
 	mcr	p15, 0, r0, c7, c7, 0	/* flush Icache, Dcache and BTB     */
-    CPWAIT
+	CPWAIT
 
 	mcr	p15, 0, r0, c8, c7, 0	/* flush instuction and data TLBs   */
-    CPWAIT
+	CPWAIT
 
 	/* Enable the Icache                                                */
 /*
 	mrc	p15, 0, r0, c1, c0, 0
 	orr	r0, r0, #0x1800
 	mcr	p15, 0, r0, c1, c0, 0
-    CPWAIT
+	CPWAIT
 */
 	mov	pc, lr
 
diff --git a/drivers/smc91111.c b/drivers/smc91111.c
index 62d213339..6244b4eb2 100644
--- a/drivers/smc91111.c
+++ b/drivers/smc91111.c
@@ -771,7 +771,7 @@ static int smc_rcv()
 		if (packet_length & 3) {
 			int i;
 
-			byte *tail = NetRxPackets[0] + (packet_length & ~3);
+			byte *tail = (byte *)(NetRxPackets[0] + (packet_length & ~3));
 			dword leftover = SMC_inl(SMC91111_DATA_REG);
 			for (i=0; i<(packet_length & 3); i++)
 				*tail++ = (byte) (leftover >> (8*i)) & 0xff;
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index f87f17186..5a215e495 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -46,7 +46,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE      (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 13cf60f16..d38e9db18 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -31,6 +31,8 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#define DEBUG 1
+
 /*
  * If we are developing, we might want to start U-Boot from ram
  * so we MUST NOT initialize critical regs like mem-timing ...
@@ -65,13 +67,13 @@
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
 
-#define CONFIG_BOOTDELAY	10
-#define CONFIG_BOOTARGS		"root=ramfs devfs=mount console=ttySA0,115200"
+#define CONFIG_BOOTDELAY	3
+#define CONFIG_BOOTARGS		"root=/dev/nfs ip=bootp console=ttyS0,19200"
 #define CONFIG_ETHADDR		FF:FF:FF:FF:FF:FF
 #define CONFIG_NETMASK		255.255.255.0
 #define CONFIG_IPADDR		192.168.1.56
 #define CONFIG_SERVERIP		192.168.1.2
-#define CONFIG_BOOTCOMMAND	""
+#define CONFIG_BOOTCOMMAND	"bootm 0x40000"
 
 #if (CONFIG_COMMANDS & CFG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	115200		/* speed to run kgdb serial port */
@@ -90,8 +92,8 @@
 #define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 #define CFG_LONGHELP				/* undef to save memory         */
-#define CFG_PROMPT		"=> "		/* Monitor Command Prompt       */
-#define CFG_CBSIZE		256		/* Console I/O Buffer Size      */
+#define CFG_PROMPT		"uboot> "	/* Monitor Command Prompt       */
+#define CFG_CBSIZE		128		/* Console I/O Buffer Size      */
 #define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
 #define CFG_MAXARGS		16		/* max number of command args   */
 #define CFG_BARGSIZE		CFG_CBSIZE	/* Boot Argument Buffer Size    */
@@ -176,7 +178,6 @@
 #define CFG_MSC2_VAL        0x00000000
 #define CFG_MDCNFG_VAL      0x09a909a9
 #define CFG_MDREFR_VAL      0x03ca0030
-/* #define CFG_MDREFR_VAL_100  ??? */
 #define CFG_MDMRS_VAL       0x00220022
 
 /*
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 673e76709..5a7642b0c 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -46,7 +46,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 6b30ce126..9a4c7e6ac 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -47,7 +47,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index 99e0a4bd2..fb35bd4e7 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -47,7 +47,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/lart.h b/include/configs/lart.h
index aa2dfa048..32153fc52 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -45,7 +45,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index eb5ed2f35..187c33f29 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -48,7 +48,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE      (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN      (CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index c2817071d..53cc8cf9b 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -51,7 +51,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index 0cd6e7fac..543dfb071 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -54,7 +54,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 8cebbec1f..766b8feec 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -53,7 +53,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 709676700..4472087e1 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -53,7 +53,7 @@
 /*
  * Size of malloc() pool
  */
-#define CONFIG_MALLOC_SIZE	(CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN		(CFG_ENV_SIZE + 128*1024)
 
 /*
  * Hardware drivers
diff --git a/include/version.h b/include/version.h
index e17f651ba..e10c62fca 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,6 +24,6 @@
 #ifndef	__VERSION_H__
 #define	__VERSION_H__
 
-#define	U_BOOT_VERSION	"U-Boot 0.1.0"
+#define	U_BOOT_VERSION	"U-Boot 0.1.1"
 
 #endif	/* __VERSION_H__ */
diff --git a/lib_arm/armlinux.c b/lib_arm/armlinux.c
index e5b8faa81..33f86e9ff 100644
--- a/lib_arm/armlinux.c
+++ b/lib_arm/armlinux.c
@@ -37,16 +37,20 @@
     defined (CONFIG_INITRD_TAG) || \
     defined (CONFIG_VFD)
 static void setup_start_tag(bd_t *bd);
+# ifdef CONFIG_SETUP_MEMORY_TAGS
 static void setup_memory_tags(bd_t *bd);
+# endif
 static void setup_commandline_tag(bd_t *bd, char *commandline);
 #if 0
 static void setup_ramdisk_tag(bd_t *bd);
 #endif
+# ifdef CONFIG_INITRD_TAG
 static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end);
+# endif
 static void setup_end_tag(bd_t *bd);
-#if defined (CONFIG_VFD)
+# if defined (CONFIG_VFD)
 static void setup_videolfb_tag(gd_t *gd);
-#endif
+# endif
 
 
 static struct tag *params;
@@ -220,6 +224,7 @@ static void setup_start_tag(bd_t *bd)
 }
 
 
+#ifdef CONFIG_SETUP_MEMORY_TAGS
 static void setup_memory_tags(bd_t *bd)
 {
     int i;
@@ -234,6 +239,7 @@ static void setup_memory_tags(bd_t *bd)
 	params = tag_next(params);
     }
 }
+#endif	/* CONFIG_SETUP_MEMORY_TAGS */
 
 
 static void setup_commandline_tag(bd_t *bd, char *commandline)
@@ -262,6 +268,8 @@ static void setup_commandline_tag(bd_t *bd, char *commandline)
 #ifndef ATAG_INITRD2
 #define ATAG_INITRD2    0x54420005
 #endif
+
+#ifdef CONFIG_INITRD_TAG
 static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end)
 {
     /* an ATAG_INITRD node tells the kernel where the compressed
@@ -275,6 +283,7 @@ static void setup_initrd_tag(bd_t *bd, ulong initrd_start, ulong initrd_end)
 
     params = tag_next(params);
 }
+#endif	/* CONFIG_INITRD_TAG */
 
 
 #if 0
diff --git a/lib_arm/board.c b/lib_arm/board.c
index e58529f59..47dc53ce1 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -49,7 +49,7 @@ static ulong mem_malloc_brk = 0;
 static void mem_malloc_init (ulong dest_addr)
 {
 	mem_malloc_start = dest_addr;
-	mem_malloc_end = dest_addr + CONFIG_MALLOC_SIZE;
+	mem_malloc_end = dest_addr + CFG_MALLOC_LEN;
 	mem_malloc_brk = mem_malloc_start;
 
 	memset ((void *) mem_malloc_start, 0,
@@ -169,7 +169,7 @@ init_fnc_t *init_sequence[] = {
 	env_init,		/* initialize environment */
 	init_baudrate,		/* initialze baudrate settings */
 	serial_init,		/* serial communications setup */
-	display_banner,
+	display_banner,		/* say that we are here */
 	dram_init,		/* configure available RAM banks */
 	display_dram_config,