blob-cvs-commit — blob CVS commit messages list

blob/src start.S,1.1.1.1.2.6,1.1.1.1.2.7

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv12400

Modified Files:
      Tag: blob_1_0_9_hack
	start.S 
Log Message:
- Set clock speed in a slightly more modular way
- Resume-from-suspend should work right now. not yet tested with linux, but
  at least blob boots properly


Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/start.S,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7
--- start.S	2001/07/12 16:25:45	1.1.1.1.2.6
+++ start.S	2001/07/16 21:43:20	1.1.1.1.2.7
@@ -60,17 +60,30 @@
 /* Register addresses can be found in [1] Appendix A */
 IC_BASE:        .word   0x90050000
 #define ICMR    0x04
+	
 PWR_BASE:	.word	0x90020000
 #define PSPR	0x08
 #define PPCR	0x14
+	
 RST_BASE:	.word	0x90030000
 #define RCSR	0x04
+
+/* main memory starts at 0xc0000000 */
+MEM_START:	.long	0xc0000000
 
-MEM_START:	.word	0xc0000000
 
+/* The initial CPU speed. Note that the SA11x0 CPUs can be safely overclocked:
+ * 190 MHz CPUs are able to run at 221 MHz, 133 MHz CPUs can do 206 Mhz.
+ */
+#if defined SHANNON
+cpuspeed:	.long	0xa0	/* 206 MHz */
+#else
+cpuspeed:	.long	0x0b	/* 221 MHz */
+#endif
 
 
 
+
 /* the actual reset code */
 reset:
 	/* First, mask **ALL** interrupts */
@@ -78,20 +91,10 @@
 	mov	r1, #0x00
 	str	r1, [r0, #ICMR]
 
-#if defined SHANNON
-	/* Switch the CPU to 206.4 MHz by writing the PPCR. */
-	/* Don't worry, 206.4 MHz is also safe for 133 MHz CPUs. */
-	mov	r1, #0x90000000
-	add	r1, r1, #0x20000
-	mov	r2, #0x0a
-	str	r2, [r1, #0x14]
-#else
-	/* Switch the CPU to 221 MHz by writing the PPCR. */
-	/* Don't worry, 221 MHz is also safe for 190 MHz CPUs. */
+	/* switch CPU to correct speed */
 	ldr	r0, PWR_BASE
-	mov	r1, #0x0b
+	LDR	r1, cpuspeed
 	str	r1, [r0, #PPCR]
-#endif
 
 	/* setup memory */
 	bl	memsetup
@@ -99,27 +102,28 @@
 	/* init LED */
 	bl	ledinit
 	
+	/* check if this is a wake-up from sleep */
+	ldr	r0, RST_BASE
+	ldr	r1, [r0, #RCSR]
+	and	r1, r1, #0x0f
+	teq	r1, #0x08
+	bne	normal_boot	/* no, continue booting */
+
+	/* yes, a wake-up. clear RCSR by writing a 1 (see 9.6.2.1 from [1]) */
+	mov	r1, #0x08
+	str	r1, [r0, #RCSR]	;
+	
+	/* get the value from the PSPR and jump to it */
+	ldr	r0, PWR_BASE
+	ldr	r1, [r0, #PSPR]
+	mov	pc, r1
+
+normal_boot:
 	/* enable I-cache */
 	mrc	p15, 0, r1, c1, c0, 0	@ read control reg
 	orr	r1, r1, #0x1000		@ set Icache
 	mcr	p15, 0, r1, c1, c0, 0	@ write it back
 
-/*wook found that normal_boot is never reached when this code present! */
-	/* check if this is a wake-up from sleep */
-//	ldr	r0, RST_BASE
-//	ldr	r1, [r0, #RCSR]
-//	tst	r1, #0x08
-//	bne	normal_boot	/* no, continue booting */
-
-	/* yes, a wake-up. get the value from the PSPR and jump to it */
-//	ldr	r0, PWR_BASE
-//	ldr	r1, [r0, #PSPR]
-//	mov	pc, r1
-
-
-
-
-normal_boot:
 	/* check the first 1MB  in increments of 4k */
 	mov	r7, #0x1000
 	mov	r6, r7, lsl #8	/* 4k << 2^8 = 1MB */

blob/src memsetup.S,1.1.2.2,1.1.2.3

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv12172

Modified Files:
      Tag: blob_1_0_9_hack
	memsetup.S 
Log Message:
Minor cleanup


Index: memsetup.S
===================================================================
RCS file: /cvsroot/blob/blob/src/Attic/memsetup.S,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- memsetup.S	2001/07/16 14:55:07	1.1.2.2
+++ memsetup.S	2001/07/16 21:41:26	1.1.2.3
@@ -42,6 +42,7 @@
 
 
 MEM_BASE:	.long	0xa0000000
+MEM_START:	.long	0xc0000000
 #define	MDCNFG	0x0
 #define MDCAS0	0x04
 #define MDCAS1	0x08
@@ -109,8 +110,7 @@
 	 * We don't print anymore in the low level loader, so we need this
 	 * on all architectures.
 	 */
-
-	ldr	r1, =0xC0000000
+	ldr	r1, MEM_START
 
 .rept	8
 	ldr	r0, [r1]

blob/src main.c,1.1.1.1.2.5,1.1.1.1.2.6

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv12020

Modified Files:
      Tag: blob_1_0_9_hack
	main.c 
Log Message:
Updated copyright notice (we're already in 2001)


Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/main.c,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- main.c	2001/07/08 22:34:14	1.1.1.1.2.5
+++ main.c	2001/07/16 21:40:41	1.1.1.1.2.6
@@ -103,10 +103,10 @@
 	/* Print the required GPL string */
 	SerialOutputString("\rConsider yourself LARTed!\r\r");
 	SerialOutputString(PACKAGE " version " VERSION  "\r"
-			   "Copyright (C) 1999 2000 "
+			   "Copyright (C) 1999 2000 2001 "
 			   "Jan-Derk Bakker and Erik Mouw\r"
 			   "Copyright (C) 2000 "
-			   "Johan Pouwelse.\r");
+			   "Johan Pouwelse\r");
 	SerialOutputString(PACKAGE " comes with ABSOLUTELY NO WARRANTY; "
 			   "read the GNU GPL for details.\r");
 	SerialOutputString("This is free software, and you are welcome "
@@ -223,6 +223,7 @@
 
 	/* flush I-cache */
 	asm ("mcr p15, 0, %0, c7, c5, 0": : "r" (i));
+
 #if defined ASSABET
 	theKernel(0, 25);
 #elif defined BRUTUS

blob configure.in,1.1.1.1.2.5,1.1.1.1.2.6

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv11547

Modified Files:
      Tag: blob_1_0_9_hack
	configure.in 
Log Message:
Fix proper compiler flags


Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- configure.in	2001/07/11 18:47:43	1.1.1.1.2.5
+++ configure.in	2001/07/16 21:38:59	1.1.1.1.2.6
@@ -209,7 +209,7 @@
 LDFLAGS=`echo $LDFLAGS | sed 's/\ *-g\ */\ /'`
 
 dnl Add some StrongARM specific flags
-CFLAGS=`echo $CFLAGS -march=armv4 -mcpu=strongarm1100 -fomit-frame-pointer -mapcs-32 -nostdinc`
+CFLAGS=`echo $CFLAGS -march=armv4 -mtune=strongarm1100 -fomit-frame-pointer -mapcs-32 -nostdinc`
 LDFLAGS=`echo $LDFLAGS -static -nostdlib`
 OCFLAGS="-O binary -R .note -R .comment -S"
 AC_SUBST(OCFLAGS)

blob/src flashasm.S,1.1.2.1,1.1.2.2

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv24782

Modified Files:
      Tag: blob_1_0_9_hack
	flashasm.S 
Log Message:
Use the funny flash mapping only for LART.


Index: flashasm.S
===================================================================
RCS file: /cvsroot/blob/blob/src/Attic/flashasm.S,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- flashasm.S	2001/07/08 22:34:14	1.1.2.1
+++ flashasm.S	2001/07/16 15:49:22	1.1.2.2
@@ -32,7 +32,9 @@
 .globl	data_from_flash
 	/* Subroutine that takes data in r0 and formats it so it will be in */
 	/* the correct order for the internal flash */
+	/* used for LART only */
 data_to_flash:
+#if defined LART
 	mov	r1, #0x0
 
 	tst	r0, #0x00000001
@@ -104,10 +106,12 @@
 	orrne	r1, r1, #0x10000000
 
 	mov	r0, r1
+#endif
 	mov	pc, r14
 
 	/* Takes data received from the flash, and unshuffles it. */
 data_from_flash:
+#if defined LART
 	mov	r1, #0x00
 
 	tst	r0, #0x00000001
@@ -179,6 +183,7 @@
 	orrne	r1, r1, #0x00400000
 
 	mov	r0, r1
+#endif
 	mov	pc, r14
 
 

blob/src memsetup.S,1.1.2.1,1.1.2.2 ledasm.S,1.1.2.1,1.1.2.2

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv10382

Modified Files:
      Tag: blob_1_0_9_hack
	memsetup.S ledasm.S 
Log Message:
PLEB updates from Adam Wiggins


Index: memsetup.S
===================================================================
RCS file: /cvsroot/blob/blob/src/Attic/memsetup.S,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- memsetup.S	2001/07/08 22:34:14	1.1.2.1
+++ memsetup.S	2001/07/16 14:55:07	1.1.2.2
@@ -58,10 +58,10 @@
 #endif
 	
 #if defined PLEB
-mdcas0:		.long	0xc71c703f
-mdcas1:		.long	0xffc71c71
+mdcas0:		.long	0x1c71c01f
+mdcas1:		.long	0xff1c71c7
 mdcas2:		.long	0xffffffff
-mdcnfg:		.long	0x0334b22f
+mdcnfg:		.long	0x0c7f3ca3
 #endif
 
 #if defined SHANNON

Index: ledasm.S
===================================================================
RCS file: /cvsroot/blob/blob/src/Attic/ledasm.S,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ledasm.S	2001/07/11 18:59:03	1.1.2.1
+++ ledasm.S	2001/07/16 14:55:07	1.1.2.2
@@ -38,6 +38,8 @@
 LED:		.long 0x00800000
 #elif defined NESA
 LED:		.long 0x00800000
+#elif defined PLEB
+LED:		.long 0x00010000
 #else
 LED:		.long 0x00000000
 #warning "FIXME: Include code to turn on one of the LEDs on your board"

blob/src start.S,1.1.1.1.2.5,1.1.1.1.2.6

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv9075/src

Modified Files:
      Tag: blob_1_0_9_hack
	start.S 
Log Message:
white space

Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/start.S,v
retrieving revision 1.1.1.1.2.5
retrieving revision 1.1.1.1.2.6
diff -u -r1.1.1.1.2.5 -r1.1.1.1.2.6
--- start.S	2001/07/11 18:59:02	1.1.1.1.2.5
+++ start.S	2001/07/12 16:25:45	1.1.1.1.2.6
@@ -78,8 +78,7 @@
 	mov	r1, #0x00
 	str	r1, [r0, #ICMR]
 
-
-#if defined SHANNON	
+#if defined SHANNON
 	/* Switch the CPU to 206.4 MHz by writing the PPCR. */
 	/* Don't worry, 206.4 MHz is also safe for 133 MHz CPUs. */
 	mov	r1, #0x90000000

blob/src ledasm.S,NONE,1.1.2.1 start.S,1.1.1.1.2.4,1.1.1.1.2.5 Makefile.am,1.1.1.1.2.1,1.1.1.1.2.2

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv27118

Modified Files:
      Tag: blob_1_0_9_hack
	start.S Makefile.am 
Added Files:
      Tag: blob_1_0_9_hack
	ledasm.S 
Log Message:
re-enable LED support


***** Error reading new file: [Errno 2] No such file or directory: 'ledasm.S'
Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/start.S,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- start.S	2001/07/08 22:34:14	1.1.1.1.2.4
+++ start.S	2001/07/11 18:59:02	1.1.1.1.2.5
@@ -97,6 +97,9 @@
 	/* setup memory */
 	bl	memsetup
 
+	/* init LED */
+	bl	ledinit
+	
 	/* enable I-cache */
 	mrc	p15, 0, r1, c1, c0, 0	@ read control reg
 	orr	r1, r1, #0x1000		@ set Icache

Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/Makefile.am,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- Makefile.am	2001/07/08 22:34:14	1.1.1.1.2.1
+++ Makefile.am	2001/07/11 18:59:03	1.1.1.1.2.2
@@ -26,6 +26,7 @@
 blob_start_elf32_SOURCES	= \
 	start.S \
 	memsetup.S \
+	ledasm.S \
 	testmem.S
 
 

blob configure.in,1.1.1.1.2.4,1.1.1.1.2.5

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv24654

Modified Files:
      Tag: blob_1_0_9_hack
	configure.in 
Log Message:
better CFLAGS (makes blob about 1k smaller)


Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- configure.in	2001/07/08 13:40:04	1.1.1.1.2.4
+++ configure.in	2001/07/11 18:47:43	1.1.1.1.2.5
@@ -209,7 +209,7 @@
 LDFLAGS=`echo $LDFLAGS | sed 's/\ *-g\ */\ /'`
 
 dnl Add some StrongARM specific flags
-CFLAGS=`echo $CFLAGS -nostdinc -mcpu=strongarm110 -mapcs-32 -fomit-frame-pointer -fPIC`
+CFLAGS=`echo $CFLAGS -march=armv4 -mcpu=strongarm1100 -fomit-frame-pointer -mapcs-32 -nostdinc`
 LDFLAGS=`echo $LDFLAGS -static -nostdlib`
 OCFLAGS="-O binary -R .note -R .comment -S"
 AC_SUBST(OCFLAGS)

Re: blob README,1.1.1.1,1.1.1.1.2.1 acconfig.h,1.1.1.1.2.2,1.1.1.1.2.3 configure.in,1.1.1.1.2.2,1.1.1.1.2.3

[Tim R. <Ti...@Ri...>]

The final plan is to install using the inferno loader. I will add that
when I have it working. Those steps are really just a reminder to me.
;-)

If they bug ya, then nuke em.

At present I'm using the the same jtag dongle, yes. With a modified
jflash dor the flash chips we have. It's in TuxScreen cvs if you'd like
to see the changes.

Perhaps jflash should be a separate CVS module?

Erik Mouw wrote:
> This is how to build blob for shannon, not how to install it. The build
> instructions are a bit higher up in the file, could you provide
> installation instructions over here? IIRC you used the same JTAG dongle
> as LART, right?

-- 
Tim Riker - http://rikers.org/ - short SIGs! <g>
All I need to know I could have learned in Kindergarten
... if I'd just been paying attention.

blob/src trampoline.S,NONE,1.1.2.1

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv22652

Added Files:
      Tag: blob_1_0_9_hack
	trampoline.S 
Log Message:
forgot to add this essential file


***** Error reading new file: [Errno 2] No such file or directory: 'trampoline.S'

blob/src flashasm.S,NONE,1.1.2.1 memsetup.S,NONE,1.1.2.1 rest-ld-script,NONE,1.1.2.1 start-ld-script,NONE,1.1.2.1 testmem.S,NONE,1.1.2.1 testmem2.S,NONE,1.1.2.1 Makefile.am,1.1.1.1,1.1.1.1.2.1 flash.c,1.1.1.1,1.1.1.1.2.1 main.c,1.1.1.1.2.4,1.1.1.1.2.5 start.S,1.1.1.1.2.3,1.1.1.1.2.4 ld-script,1.1.1.1,NONE

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv22063/src

Modified Files:
      Tag: blob_1_0_9_hack
	Makefile.am flash.c main.c start.S 
Added Files:
      Tag: blob_1_0_9_hack
	flashasm.S memsetup.S rest-ld-script start-ld-script testmem.S 
	testmem2.S 
Removed Files:
      Tag: blob_1_0_9_hack
	ld-script 
Log Message:
- added Russ, Tim, and Wookey to the AUTHORS file
- updated ChangeLog
- run-from-RAM patch


***** Error reading new file: [Errno 2] No such file or directory: 'flashasm.S'
***** Error reading new file: [Errno 2] No such file or directory: 'memsetup.S'
***** Error reading new file: [Errno 2] No such file or directory: 'rest-ld-script'
***** Error reading new file: [Errno 2] No such file or directory: 'start-ld-script'
***** Error reading new file: [Errno 2] No such file or directory: 'testmem.S'
***** Error reading new file: [Errno 2] No such file or directory: 'testmem2.S'
Index: Makefile.am
===================================================================
RCS file: /cvsroot/blob/blob/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Makefile.am	2001/06/27 19:47:42	1.1.1.1
+++ Makefile.am	2001/07/08 22:34:14	1.1.1.1.2.1
@@ -12,46 +12,90 @@
 
 
 bin_PROGRAMS	= \
-	blob-elf32 \
+	blob-start-elf32 \
+	blob-start \
+	blob-rest-elf32 \
+	blob-rest \
 	blob
 
 
+# First specify how to build the first stage loader
+
 # WARNING: start.S *must* be the first file, otherwise the target will
 # be linked in the wrong order!
-blob_elf32_SOURCES	= \
+blob_start_elf32_SOURCES	= \
 	start.S \
-	clock.c \
-	command.c \
+	memsetup.S \
+	testmem.S
+
+
+blob_start_elf32_LDFLAGS	+= \
+	-Wl,-T,${top_srcdir}/src/start-ld-script
+
+blob_start_elf32_LDADD	+= \
+	-lgcc
+
+
+blob_start_SOURCES		=
+
+
+blob-start: blob-start-elf32
+	$(OBJCOPY) $(OCFLAGS) $< $@
+
+
+# Now specify how to build the second stage loader
+
+blob_rest_elf32_SOURCES = \
+	trampoline.S \
+	testmem2.S \
+	flashasm.S \
 	main.c \
-	flash.c \
 	serial.c \
-	time.c \
+	command.c \
+	clock.c \
 	util.c \
-	uucodec.c
+	time.c \
+	uucodec.c \
+	flash.c
 
 
-blob_SOURCES		=
+blob_rest_elf32_LDFLAGS	+= \
+	-Wl,-T,${top_srcdir}/src/rest-ld-script
 
 
-EXTRA_DIST		= \
-	ld-script
+blob_rest_elf32_LDADD	+= \
+	-lgcc
 
 
-blob_elf32_LDFLAGS	+= \
-	-Wl,-T,${top_srcdir}/src/ld-script
+blob_rest_SOURCES	=
 
 
-blob_elf32_LDADD	+= \
-	-lgcc
+blob-rest: blob-rest-elf32
+	$(OBJCOPY) $(OCFLAGS) $< $@
+
+
+# Finally specify how to build the full binary
+
+blob_SOURCES	=
 
 
+blob: blob-start blob-rest
+	rm -f $@
+	dd if=blob-start of=$@ bs=1k conv=sync
+	dd if=blob-rest of=$@ bs=1k seek=1
+	chmod +x blob
+
+
+# automake administrativia
+
+EXTRA_DIST	= \
+	start-ld-script \
+	rest-ld-script
+
+
 INCLUDES		+= \
 	-I${top_builddir}/include \
 	-I${top_srcdir}/include
-
-
-blob: blob-elf32
-	$(OBJCOPY) $(OCFLAGS) $< $@
 
 
 CLEANFILES	= *~

Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/flash.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- flash.c	2001/06/27 19:47:42	1.1.1.1
+++ flash.c	2001/07/08 22:34:14	1.1.1.1.2.1
@@ -132,11 +132,6 @@
 	char	*thisBlock;
 	int	numBlocks, i;
 
-	if(RunningFromInternal()) {
-		SerialOutputString("*** Can't erase -- running from internal flash.\r");
-		return;
-	}
-	
 	if(which == blKernel) {
 		thisBlock = (char *)KERNEL_START;
 		numBlocks = NUM_KERNEL_BLOCKS;

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/main.c,v
retrieving revision 1.1.1.1.2.4
retrieving revision 1.1.1.1.2.5
diff -u -r1.1.1.1.2.4 -r1.1.1.1.2.5
--- main.c	2001/07/08 13:52:16	1.1.1.1.2.4
+++ main.c	2001/07/08 22:34:14	1.1.1.1.2.5
@@ -85,8 +85,9 @@
 
 
 
-void c_main(char *blockBase, u32 blockSize)
+int main(void)
 {
+	u32 blockSize = 0x00800000;
 	int numRead = 0;
 	char commandline[128];
 	blobStatus status;
@@ -98,21 +99,10 @@
 	 */
 	SerialInit(baud9k6);
 	TimerInit();
-	
-	/* initialise status */
-	status.kernelSize = 0;
-	status.kernelType = fromFlash;
-	status.ramdiskSize = 0;
-	status.ramdiskType = fromFlash;
-	status.blockSize = blockSize;
-	status.downloadSpeed = baud115k2;
-	
-	/* Load kernel and ramdisk from flash to RAM */
-	Reload("kernel", &status);
-	Reload("ramdisk", &status);
 
 	/* Print the required GPL string */
-	SerialOutputString("\r" PACKAGE " version " VERSION  "\r"
+	SerialOutputString("\rConsider yourself LARTed!\r\r");
+	SerialOutputString(PACKAGE " version " VERSION  "\r"
 			   "Copyright (C) 1999 2000 "
 			   "Jan-Derk Bakker and Erik Mouw\r"
 			   "Copyright (C) 2000 "
@@ -123,17 +113,29 @@
 			   "to redistribute it\r");
 	SerialOutputString("under certain conditions; "
 			   "read the GNU GPL for details.\r\r");
+
+
+	/* initialise status */
+	status.kernelSize = 0;
+	status.kernelType = fromFlash;
+	status.ramdiskSize = 0;
+	status.ramdiskType = fromFlash;
+	status.blockSize = blockSize;
+	status.downloadSpeed = baud115k2;
+	
 
-	/* and some information */
+	/* Load kernel and ramdisk from flash to RAM */
+	Reload("kernel", &status);
+	Reload("ramdisk", &status);
+
 #ifdef BLOB_DEBUG
+	/* print some information */
 	SerialOutputString("Running from ");
 	if(RunningFromInternal())
 		SerialOutputString("internal flash\r");
 	else
 		SerialOutputString("external flash\r");
 
-	SerialOutputString("blockBase = 0x");
-	SerialOutputHex((int) blockBase);
 	SerialOutputString(", blockSize = 0x");
 	SerialOutputHex(blockSize);
 	SerialOutputByte('\r');
@@ -192,6 +194,8 @@
 			}
 		}
 	}
+
+	return 0;
 } /* c_main */
 
 
@@ -314,11 +318,6 @@
 	u32 startAddress = 0;
 	tBlockType block;
 	int numBytes = 0;;
-
-	if(RunningFromInternal()) {
-		SerialOutputString("*** Flash not possible when using internal flash\r");
-		return;
-	}
 
 	if(MyStrNCmp(commandline, "kernel", 6) == 0) {
 		startAddress = KERNEL_RAM_BASE;

Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/start.S,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- start.S	2001/07/07 19:24:40	1.1.1.1.2.3
+++ start.S	2001/07/08 22:34:14	1.1.1.1.2.4
@@ -1,17 +1,7 @@
-###########################################################################
-## Filename:      start.S
-## Version:       $Id$
-## Copyright:     Copyright (C) 1999, Erik Mouw
-## Author:        Erik Mouw <J.A...@it...>
-## Description:   blob start code
-## Created at:    Sun Jul 18 20:29:08 1999
-## Modified by:   Erik Mouw <J.A...@it...>
-## Modified at:   Fri Jul  14 17:55:36 2000
-###########################################################################
 /*
[...1123 lines suppressed...]
 
 
 
-abort_data:
-	b	abort_data
+data_abort:
+	b	data_abort
 
 
 
@@ -1090,8 +224,8 @@
 	b	not_used
 
 
+
 
-	
 irq:
 	b	irq
 

--- ld-script DELETED ---

blob AUTHORS,1.1.1.1,1.1.1.1.2.1 ChangeLog,1.1.1.1.2.2,1.1.1.1.2.3

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv22063

Modified Files:
      Tag: blob_1_0_9_hack
	AUTHORS ChangeLog 
Log Message:
- added Russ, Tim, and Wookey to the AUTHORS file
- updated ChangeLog
- run-from-RAM patch


Index: AUTHORS
===================================================================
RCS file: /cvsroot/blob/blob/AUTHORS,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- AUTHORS	2001/06/27 19:47:41	1.1.1.1
+++ AUTHORS	2001/07/08 22:34:14	1.1.1.1.2.1
@@ -32,7 +32,18 @@
 - Erik Mouw (J.A...@it...)
 
 
+* NESA port
+===========
+- Russ Dill (Rus...@as...)
+
+
+* Shannon (aka TuxScreen) port
+==============================
+- Tim Riker (ti...@ri...)
+
+
 * Various fixes
 ===============
 - Mark Huang (mh...@li...), RTC fix
 - Justin M. Seger (jus...@in...), Assabet fixes
+- Wookey (wo...@al...), run-from-RAM

Index: ChangeLog
===================================================================
RCS file: /cvsroot/blob/blob/ChangeLog,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- ChangeLog	2001/07/07 16:08:40	1.1.1.1.2.2
+++ ChangeLog	2001/07/08 22:34:14	1.1.1.1.2.3
@@ -3,6 +3,7 @@
 	
 blob-1.0.9:
 - we moved to SourceForge!
+- run from RAM
 
 blob-1.0.8-pre2:
 - Assabet fixes by Justin Seger

blob/src main.c,1.1.1.1.2.3,1.1.1.1.2.4

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv4088/src

Modified Files:
      Tag: blob_1_0_9_hack
	main.c 
Log Message:
more CreditLART


Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/main.c,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- main.c	2001/07/07 19:24:40	1.1.1.1.2.3
+++ main.c	2001/07/08 13:52:16	1.1.1.1.2.4
@@ -223,13 +223,14 @@
 	theKernel(0, 25);
 #elif defined BRUTUS
 	theKernel(0, 16);
+#elif defined CLART
+	theKernel(0, 68);
 #elif defined LART
 	theKernel(0, 27);
 #elif defined NESA
 	theKernel(0, 75);
 #elif defined PLEB
-#warning "This is NOT the correct PLEB architecture number!"
-	theKernel(0, 18);
+	theKernel(0, 20);
 #elif defined SHANNON
 #warning "This is NOT the correct SHANNON architecture number!"
 	theKernel(0, 18);

Re: blob README,1.1.1.1,1.1.1.1.2.1 acconfig.h,1.1.1.1.2.2,1.1.1.1.2.3 configure.in,1.1.1.1.2.2,1.1.1.1.2.3

[Erik M. <J.A...@IT...>]

On Sat, Jul 07, 2001 at 12:24:42PM -0700, Tim Riker wrote:
> Index: README
> ===================================================================
> RCS file: /cvsroot/blob/blob/README,v
> retrieving revision 1.1.1.1
> retrieving revision 1.1.1.1.2.1
> diff -u -r1.1.1.1 -r1.1.1.1.2.1
> --- README	2001/06/27 19:47:41	1.1.1.1
> +++ README	2001/07/07 19:24:39	1.1.1.1.2.1
> @@ -161,6 +164,23 @@
>    up with the output on the serial port.
>  
>  
> +*** SHANNON (TuxScreen phone)
> +-----------
> +
> +Try these steps for use on a tuxscreen. Replace /usr/src/linux with the
> +location of your arm linux kernel sources that you will be running on the
> +tuxscreen:
> +
> +If you got the sources from CVS you will need to do:
> + 
> +tools/rebuild-gcc && tools/rebuild-gcc
> + 
> +(Yes, twice) Then do:
> +
> +CC=arm-linux-gcc ./configure  --with-linux-prefix=/usr/src/linux \
> +	--enable-maintainer-mode --with-board=shannon arm-linux
> +
> +make

This is how to build blob for shannon, not how to install it. The build
instructions are a bit higher up in the file, could you provide
installation instructions over here? IIRC you used the same JTAG dongle
as LART, right?


Erik

-- 
J.A.K. (Erik) Mouw, Information and Communication Theory Group, Department
of Electrical Engineering, Faculty of Information Technology and Systems,
Delft University of Technology, PO BOX 5031,  2600 GA Delft, The Netherlands
Phone: +31-15-2783635  Fax: +31-15-2781843  Email: J.A...@it...
WWW: http://www-ict.its.tudelft.nl/~erik/

blob/include config.h.in,1.1.2.1,NONE

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv32059/include

Removed Files:
      Tag: blob_1_0_9_hack
	config.h.in 
Log Message:
Oops, config.h.in is generated, so it doesn't belong in CVS


--- config.h.in DELETED ---

blob acconfig.h,1.1.1.1.2.3,1.1.1.1.2.4

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv32059

Modified Files:
      Tag: blob_1_0_9_hack
	acconfig.h 
Log Message:
Oops, config.h.in is generated, so it doesn't belong in CVS


Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- acconfig.h	2001/07/07 19:24:39	1.1.1.1.2.3
+++ acconfig.h	2001/07/08 13:42:56	1.1.1.1.2.4
@@ -59,6 +59,9 @@
 /* Define for Brutus boards */
 #undef BRUTUS
 
+/* Define for CreditLART boards */
+#undef CLART
+
 /* Define for LART boards */
 #undef LART
 

blob/include config.h.in,NONE,1.1.2.1

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv31283/include

Added Files:
      Tag: blob_1_0_9_hack
	config.h.in 
Log Message:
Forgot to include config.h.in in initial release
Initial patches for CreditLART


***** Error reading new file: [Errno 2] No such file or directory: 'config.h.in'

blob configure.in,1.1.1.1.2.3,1.1.1.1.2.4

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv31283

Modified Files:
      Tag: blob_1_0_9_hack
	configure.in 
Log Message:
Forgot to include config.h.in in initial release
Initial patches for CreditLART


Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -u -r1.1.1.1.2.3 -r1.1.1.1.2.4
--- configure.in	2001/07/07 19:24:39	1.1.1.1.2.3
+++ configure.in	2001/07/08 13:40:04	1.1.1.1.2.4
@@ -83,6 +83,13 @@
 	AC_DEFINE(USE_EDODRAM)
 	AC_DEFINE(USE_SERIAL3)
 	;;
+    creditlart)
+	AC_MSG_RESULT(CreditLART)
+	AC_DEFINE(CLART)
+	AC_DEFINE(USE_SA1110)
+	AC_DEFINE(USE_SDRAM)
+	AC_DEFINE(USE_SERIAL3)
+	;;
     lart)
 	AC_MSG_RESULT(LART)
 	AC_DEFINE(LART)

blob/src serial.c,1.1.1.1,1.1.1.1.2.1

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv31411/src

Modified Files:
      Tag: blob_1_0_9_hack
	serial.c 
Log Message:
going to use NIBBLES_PER_WORD elsewhere

Index: serial.c
===================================================================
RCS file: /cvsroot/blob/blob/src/serial.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- serial.c	2001/06/27 19:47:42	1.1.1.1
+++ serial.c	2001/07/07 21:19:57	1.1.1.1.2.1
@@ -42,15 +42,6 @@
 #include "serial.h"
 #include "time.h"
 
-
-
-
-/* number of nibbles in a word */
-#define NIBBLES_PER_WORD (8)
-
-
-
-
 /*
  * Initialise the serial port with the given baudrate. The settings
  * are always 8 data bits, no parity, 1 stop bit, no start bits.

blob/include types.h,1.1.1.1.2.1,1.1.1.1.2.2

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv31411/include

Modified Files:
      Tag: blob_1_0_9_hack
	types.h 
Log Message:
going to use NIBBLES_PER_WORD elsewhere

Index: types.h
===================================================================
RCS file: /cvsroot/blob/blob/include/types.h,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- types.h	2001/07/07 19:24:40	1.1.1.1.2.1
+++ types.h	2001/07/07 21:19:57	1.1.1.1.2.2
@@ -38,6 +38,9 @@
 typedef unsigned short	u16;
 typedef	unsigned char	u8;
 
+/* number of nibbles in a word */
+#define NIBBLES_PER_WORD (8)
+
 #ifndef NULL
 #define NULL (void *)0
 #endif

blob/include flash.h,1.1.1.1.2.1,1.1.1.1.2.2

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv29943/include

Modified Files:
      Tag: blob_1_0_9_hack
	flash.h 
Log Message:
clarify logic

Index: flash.h
===================================================================
RCS file: /cvsroot/blob/blob/include/flash.h,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- flash.h	2001/07/07 19:24:40	1.1.1.1.2.1
+++ flash.h	2001/07/07 21:14:33	1.1.1.1.2.2
@@ -72,9 +72,7 @@
 #define INITRD_START		(KERNEL_START + KERNEL_LEN)
 #define INITRD_LEN		0x280000
 #define NUM_INITRD_BLOCKS	(INITRD_LEN / MAIN_BLOCK_SIZE)
-#endif
-
-#ifdef SHANNON
+#elif defined SHANNON
 #define KERNEL_START		0x8000
 #define KERNEL_LEN		0xf8000
 #define NUM_KERNEL_BLOCKS	(KERNEL_LEN / MAIN_BLOCK_SIZE)

blob/include flash.h,1.1.1.1,1.1.1.1.2.1 main.h,1.1.1.1,1.1.1.1.2.1 types.h,1.1.1.1,1.1.1.1.2.1

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv29015/include

Modified Files:
      Tag: blob_1_0_9_hack
	flash.h main.h types.h 
Log Message:
initial SHANNON patches

Index: flash.h
===================================================================
RCS file: /cvsroot/blob/blob/include/flash.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- flash.h	2001/06/27 19:47:42	1.1.1.1
+++ flash.h	2001/07/07 19:24:40	1.1.1.1.2.1
@@ -39,10 +39,10 @@
 #define NUM_FLASH_BLOCKS	(31)
 #define FLASH_BLOCK_BASE	((u32 *) 0x020000)
 #define FLASH_BLOCK_SIZE	((u32) 0x020000)
-#define	BLOCK_NAME_LEN	(64)
-#define	NO_BLOCK	((u8) 0xFF)
-#define	BLOCK_HDR_SIG	((u32) 'LART')
-#define	BLOCK_EMPTY_SIG	((u32) 0xFFFFFFFF)
+#define BLOCK_NAME_LEN	(64)
+#define NO_BLOCK	((u8) 0xFF)
+#define BLOCK_HDR_SIG	((u32) 'LART')
+#define BLOCK_EMPTY_SIG	((u32) 0xFFFFFFFF)
 
 #define BLOCK_IN_USE(x) (x.signature == BLOCK_HDR_SIG)
 
@@ -61,21 +61,30 @@
 #define MAIN_BLOCK_SIZE	(32768 * 4)
 
 #define CS0_BASE	(0x00000000)
-#define	CS1_BASE	(0x08000000)
+#define CS1_BASE	(0x08000000)
 
 #define INT_FLASH_BASE (RunningFromInternal() ? CS0_BASE : CS1_BASE)
 
 #ifdef ASSABET  // Assabet settings come from linux/drivers/block/flash_mem.h
-#define	KERNEL_START		0x10000
-#define	KERNEL_LEN		0xc0000
+#define KERNEL_START		0x10000
+#define KERNEL_LEN		0xc0000
 #define NUM_KERNEL_BLOCKS	(KERNEL_LEN / MAIN_BLOCK_SIZE)
 #define INITRD_START		(KERNEL_START + KERNEL_LEN)
 #define INITRD_LEN		0x280000
 #define NUM_INITRD_BLOCKS	(INITRD_LEN / MAIN_BLOCK_SIZE)
+#endif
+
+#ifdef SHANNON
+#define KERNEL_START		0x8000
+#define KERNEL_LEN		0xf8000
+#define NUM_KERNEL_BLOCKS	(KERNEL_LEN / MAIN_BLOCK_SIZE)
+#define INITRD_START		(KERNEL_START + KERNEL_LEN)
+#define INITRD_LEN		0x280000
+#define NUM_INITRD_BLOCKS	(INITRD_LEN / MAIN_BLOCK_SIZE)
 #else
-#define	KERNEL_START		(INT_FLASH_BASE + MAIN_BLOCK_SIZE)
+#define KERNEL_START		(INT_FLASH_BASE + MAIN_BLOCK_SIZE)
 #define NUM_KERNEL_BLOCKS	(7)
-#define	KERNEL_LEN		(NUM_KERNEL_BLOCKS * MAIN_BLOCK_SIZE)
+#define KERNEL_LEN		(NUM_KERNEL_BLOCKS * MAIN_BLOCK_SIZE)
 #define INITRD_START		(KERNEL_START + KERNEL_LEN)
 #define NUM_INITRD_BLOCKS	(24)
 #define INITRD_LEN		(NUM_INITRD_BLOCKS * MAIN_BLOCK_SIZE)

Index: main.h
===================================================================
RCS file: /cvsroot/blob/blob/include/main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- main.h	2001/06/27 19:47:42	1.1.1.1
+++ main.h	2001/07/07 19:24:40	1.1.1.1.2.1
@@ -42,14 +42,22 @@
 #ifdef ASSABET
 #define RAMDISK_RAM_BASE     (0xC0800000)
 #else 
+#ifdef SHANNON
+#define RAMDISK_RAM_BASE     (0xC0200000)
+#else
 #define RAMDISK_RAM_BASE     (0xC0400000)
 #endif
+#endif
 
 #define KERNEL_BLOCK_OFFSET  (0x00008000)
 
 #ifdef ASSABET
 #define RAMDISK_BLOCK_OFFSET (0x00800000)
 #else
+#ifdef SHANNON
+#define RAMDISK_BLOCK_OFFSET (0x00200000)
+#else
 #define RAMDISK_BLOCK_OFFSET (0x00400000)
+#endif
 #endif
 #endif

Index: types.h
===================================================================
RCS file: /cvsroot/blob/blob/include/types.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- types.h	2001/06/27 19:47:42	1.1.1.1
+++ types.h	2001/07/07 19:24:40	1.1.1.1.2.1
@@ -34,21 +34,12 @@
 #ifndef BLOB_TYPES_H
 #define BLOB_TYPES_H
 
-
-
-
 typedef unsigned long	u32;
 typedef unsigned short	u16;
 typedef	unsigned char	u8;
 
-
-
-
 #ifndef NULL
 #define NULL (void *)0
 #endif
-
-
-
 
 #endif

blob/src main.c,1.1.1.1.2.2,1.1.1.1.2.3 start.S,1.1.1.1.2.2,1.1.1.1.2.3

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src
In directory usw-pr-cvs1:/tmp/cvs-serv29015/src

Modified Files:
      Tag: blob_1_0_9_hack
	main.c start.S 
Log Message:
initial SHANNON patches

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/main.c,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- main.c	2001/07/03 20:44:34	1.1.1.1.2.2
+++ main.c	2001/07/07 19:24:40	1.1.1.1.2.3
@@ -230,6 +230,9 @@
 #elif defined PLEB
 #warning "This is NOT the correct PLEB architecture number!"
 	theKernel(0, 18);
+#elif defined SHANNON
+#warning "This is NOT the correct SHANNON architecture number!"
+	theKernel(0, 18);
 #else
 	/* Be generic and just tell the kernel that we are an SA1100
            architecture */

Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/start.S,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- start.S	2001/07/03 20:44:34	1.1.1.1.2.2
+++ start.S	2001/07/07 19:24:40	1.1.1.1.2.3
@@ -78,13 +78,21 @@
 	mov	r2, #0x00
 	str	r2, [r1, #0x4]
 
-	
+#if defined SHANNON	
+	/* Switch the CPU to 206.4 MHz by writing the PPCR. */
+	/* Don't worry, 206.4 MHz is also safe for 133 MHz CPUs. */
+	mov	r1, #0x90000000
+	add	r1, r1, #0x20000
+	mov	r2, #0x0a
+	str	r2, [r1, #0x14]
+#else
 	/* Switch the CPU to 221 MHz by writing the PPCR. */
 	/* Don't worry, 221 MHz is also safe for 190 MHz CPUs. */
 	mov	r1, #0x90000000
 	add	r1, r1, #0x20000
 	mov	r2, #0x0b
 	str	r2, [r1, #0x14]
+#endif
 
 	/* Enable I-cache */
 	mrc	p15, 0, r1, c1, c0, 0	@ read control reg
@@ -126,10 +134,23 @@
 	mov	r2,     #0x03000000
 	add	r2, r2, #0x00340000
 	add	r2, r2, #0x0000B200
+#ifdef SHANNON
+	add	r2, r2, #0x0000001f
+#else
 	add	r2, r2, #0x0000002f
+#endif
 	str	r2, [r1, #0x00]
 
+#ifdef SHANNON
+	/* Issue read requests to disabled bank to start refresh */
 
+	ldr	r1, =0xC0000000
+	/* this is required by the Micron memory on a TuxScreen */
+.rept	8	
+	ldr	r0, [r1]
+.endr
+#endif
+
 	
 #elif defined USE_SA1110
 	/* This part is actually for the Assabet only. If your board
@@ -236,19 +257,26 @@
 	mov	r2, #0x08
 	str	r2, [r1, #0x00]
 
+	/* Set BRD to 1, for a baudrate of 115k2 ([1] 11.11.4.1) */
 	/* Set BRD to 5, for a baudrate of 38k4 ([1] 11.11.4.1) */
 	/* Set BRD to 23, for a baudrate of 9k6 ([1] 11.11.4.1) */
 	mov	r2, #0x00
 	str	r2, [r1, #0x04]
+#ifdef SHANNON
+	mov	r2, #1
+#else
 	mov	r2, #23
+#endif
 	str	r2, [r1, #0x08]
 
 	/* Initialize the GPDR (GPIO Pin Direction Register) in such a
 	way that the LED is on an output port */
 
+#ifndef SHANNON
 	/* load the GPIO base in r2 */	
 	mov	r2, #0x90000000
 	add	r2, r2, #0x40000
+#endif
 
 #if defined ASSABET
 	/* Bit 17 is the LED on Zilker */
@@ -277,6 +305,8 @@
 
 #elif defined PLEB
 #warning "FIXME: Include code to turn on one of the PLEB LEDs over here"
+#elif defined SHANNON
+#warning "FIXME: Include code to turn on one of the SHANNON LEDs over here"
 #else
 #warning "FIXME: Include code to turn on one of the LEDs on your board"
 #endif
@@ -316,6 +346,17 @@
 
 	adr	r0, int_flash_str
 	bl	print_str
+#elif defined SHANNON
+	mov     r1, #0xA0000000
+	/* Put the main flash to the correct speed */
+	mov     r2,     #0xAD000000
+	add     r2, r2, #0x008C0000
+	add     r2, r2, #0x00004800
+	add     r2, r2, #0x00000088
+	str     r2, [r1, #0x10]
+
+	adr     r0, int_flash_str
+	bl      print_str
 #endif
 
 #if defined NESA
@@ -330,6 +371,10 @@
 	bl	print_str
 #endif
 
+#ifdef SHANNON
+	/* Skip the memory zeroing for speed */
+	b       zero_done
+#endif
 test_mem:
 	/* Start the memory tester, hardcoded bank 0 & 1 for now */
 	adr	r0, start_test
@@ -373,6 +418,7 @@
 	adr	r0, zeroing_done
 	bl	print_str
 
+zero_done:
 	mov	r4, #0xC0000000
 	mov	r5, #0xD0000000
 	mov	r6, r4 /* Base for current block */

blob README,1.1.1.1,1.1.1.1.2.1 acconfig.h,1.1.1.1.2.2,1.1.1.1.2.3 configure.in,1.1.1.1.2.2,1.1.1.1.2.3

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob
In directory usw-pr-cvs1:/tmp/cvs-serv29015

Modified Files:
      Tag: blob_1_0_9_hack
	README acconfig.h configure.in 
Log Message:
initial SHANNON patches

Index: README
===================================================================
RCS file: /cvsroot/blob/blob/README,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- README	2001/06/27 19:47:41	1.1.1.1
+++ README	2001/07/07 19:24:39	1.1.1.1.2.1
@@ -149,6 +149,9 @@
 we say more?). To meet a deadline, we decided to make a special board
 with 128 kbyte external flash memory (and an LCD interface).
 
+The JTAG flash burn code however is now worked out as a set of Linux
+executables provided by the jtag flash project located at the LART page
+as well as JTAG executables ported to support the TuxScreen screen phone.
 
 *** Assabet
 -----------
@@ -161,6 +164,23 @@
   up with the output on the serial port.
 
 
+*** SHANNON (TuxScreen phone)
+-----------
+
+Try these steps for use on a tuxscreen. Replace /usr/src/linux with the
+location of your arm linux kernel sources that you will be running on the
+tuxscreen:
+
+If you got the sources from CVS you will need to do:
+ 
+tools/rebuild-gcc && tools/rebuild-gcc
+ 
+(Yes, twice) Then do:
+
+CC=arm-linux-gcc ./configure  --with-linux-prefix=/usr/src/linux \
+	--enable-maintainer-mode --with-board=shannon arm-linux
+
+make
 
 
 ** Making a distribution

Index: acconfig.h
===================================================================
RCS file: /cvsroot/blob/blob/acconfig.h,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- acconfig.h	2001/07/01 18:22:54	1.1.1.1.2.2
+++ acconfig.h	2001/07/07 19:24:39	1.1.1.1.2.3
@@ -68,6 +68,9 @@
 /* Define for PLEB boards */
 #undef PLEB
 
+/* Define for Shannon (TuxScreen) */
+#undef SHANNON
+
 /* Define if your system uses an SA-1100 CPU */
 #undef USE_SA1100
 

Index: configure.in
===================================================================
RCS file: /cvsroot/blob/blob/configure.in,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- configure.in	2001/07/03 20:44:34	1.1.1.1.2.2
+++ configure.in	2001/07/07 19:24:39	1.1.1.1.2.3
@@ -104,6 +104,13 @@
 	AC_DEFINE(USE_EDODRAM)
 	AC_DEFINE(USE_SERIAL3)
 	;;
+    shannon)
+	AC_MSG_RESULT(SHANNON)
+	AC_DEFINE(SHANNON)
+	AC_DEFINE(USE_SA1100)
+	AC_DEFINE(USE_EDODRAM)
+	AC_DEFINE(USE_SERIAL3)
+	;;
     *)
 	AC_MSG_RESULT(unknown)
 	AC_MSG_WARN([Unknown board name, assuming SA1100 with EDO DRAM and serial 3])