CVS: blob/src/blob chkmem.c,1.1,1.2 clock.c,1.1,1.2 debug.c,1.1,1.2 flash.c,1.1,1.2 flashasm.S,1.1,1.2 linux.c,1.1,1.2 main.c,1.1,1.2 memory.c,1.1,1.2 param_block.c,1.1,1.2 reboot.c,1.1,1.2 testmem2.S,1.1,1.2 trampoline.S,1.1,1.2 uucodec.c,1.1,1.2

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

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

Modified Files:
	chkmem.c clock.c debug.c flash.c flashasm.S linux.c main.c 
	memory.c param_block.c reboot.c testmem2.S trampoline.S 
	uucodec.c 
Log Message:
Fix include files


Index: chkmem.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/chkmem.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- chkmem.c	2001/10/07 19:04:25	1.1
+++ chkmem.c	2001/10/07 19:34:17	1.2
@@ -32,18 +32,18 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "main.h"
-#include "command.h"
-#include "types.h"
-#include "sa1100.h"
-#include "serial.h"
-#include "time.h"
-#include "util.h"
+#include <blob/main.h>
+#include <blob/command.h>
+#include <blob/types.h>
+#include <blob/sa1100.h>
+#include <blob/serial.h>
+#include <blob/time.h>
+#include <blob/util.h>
 
-#include "memory.h"
+#include <blob/memory.h>
 
 /*********************************************************************/
 /**  DEFINES *********************************************************/

Index: clock.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/clock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- clock.c	2001/10/07 19:04:25	1.1
+++ clock.c	2001/10/07 19:34:17	1.2
@@ -32,17 +32,17 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "command.h"
-#include "errno.h"
-#include "error.h"
-#include "types.h"
-#include "sa1100.h"
-#include "serial.h"
-#include "time.h"
-#include "util.h"
+#include <blob/command.h>
+#include <blob/errno.h>
+#include <blob/error.h>
+#include <blob/types.h>
+#include <blob/sa1100.h>
+#include <blob/serial.h>
+#include <blob/time.h>
+#include <blob/util.h>
 
 
 /* Struct with the SA-1100 PLL + DRAM parameter registers */

Index: debug.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/debug.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.c	2001/10/07 19:04:25	1.1
+++ debug.c	2001/10/07 19:34:17	1.2
@@ -26,15 +26,15 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "errno.h"
-#include "error.h"
-#include "types.h"
-#include "util.h"
-#include "serial.h"
-#include "command.h"
+#include <blob/errno.h>
+#include <blob/error.h>
+#include <blob/types.h>
+#include <blob/util.h>
+#include <blob/serial.h>
+#include <blob/command.h>
 
 /**********************************************************************
  * defines

Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flash.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flash.c	2001/10/07 19:04:25	1.1
+++ flash.c	2001/10/07 19:34:17	1.2
@@ -32,16 +32,16 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "errno.h"
-#include "error.h"
-#include "led.h"
-#include "main.h"
-#include "util.h"
-#include "serial.h"
-#include "flash.h"
+#include <blob/errno.h>
+#include <blob/error.h>
+#include <blob/led.h>
+#include <blob/main.h>
+#include <blob/util.h>
+#include <blob/serial.h>
+#include <blob/flash.h>
 
 /* define for advanced flash functionality (not that it works) -- Erik */
 /* #define ADVANCED_FLASH 1 */

Index: flashasm.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flashasm.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flashasm.S	2001/10/07 19:04:25	1.1
+++ flashasm.S	2001/10/07 19:34:17	1.2
@@ -22,7 +22,7 @@
 .ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <blob/config.h>
 #endif
 
 .text
@@ -107,7 +107,7 @@
 
 	mov	r0, r1
 #endif
-	mov	pc, r14
+	mov	pc, lr
 
 	/* Takes data received from the flash, and unshuffles it. */
 data_from_flash:
@@ -184,7 +184,4 @@
 
 	mov	r0, r1
 #endif
-	mov	pc, r14
-
-
-
+	mov	pc, lr

Index: linux.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/linux.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linux.c	2001/10/07 19:04:25	1.1
+++ linux.c	2001/10/07 19:34:17	1.2
@@ -22,17 +22,17 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "linux.h"
-#include "command.h"
-#include "main.h"
-#include "flash.h"
-#include "init.h"
-#include "memory.h"
-#include "serial.h"
-#include "util.h"
+#include <blob/linux.h>
+#include <blob/command.h>
+#include <blob/main.h>
+#include <blob/flash.h>
+#include <blob/init.h>
+#include <blob/memory.h>
+#include <blob/serial.h>
+#include <blob/util.h>
 
 #include <asm-arm/setup.h>
 

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- main.c	2001/10/07 19:04:25	1.1
+++ main.c	2001/10/07 19:34:17	1.2
@@ -35,23 +35,23 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "command.h"
-#include "errno.h"
-#include "error.h"
-#include "flash.h"
-#include "init.h"
-#include "led.h"
-#include "main.h"
-#include "memory.h"
-#include "param_block.h"
-#include "sa1100.h"
-#include "serial.h"
-#include "time.h"
-#include "util.h"
-#include "uucodec.h"
+#include <blob/command.h>
+#include <blob/errno.h>
+#include <blob/error.h>
+#include <blob/flash.h>
+#include <blob/init.h>
+#include <blob/led.h>
+#include <blob/main.h>
+#include <blob/memory.h>
+#include <blob/param_block.h>
+#include <blob/sa1100.h>
+#include <blob/serial.h>
+#include <blob/time.h>
+#include <blob/util.h>
+#include <blob/uucodec.h>
 
 
 

Index: memory.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memory.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- memory.c	2001/10/07 19:04:25	1.1
+++ memory.c	2001/10/07 19:34:17	1.2
@@ -22,12 +22,12 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "main.h"
-#include "memory.h"
-#include "serial.h"
+#include <blob/main.h>
+#include <blob/memory.h>
+#include <blob/serial.h>
 
 /* test in 1MB chunks */
 #define TEST_BLOCK_SIZE (1024 * 1024)

Index: param_block.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/param_block.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- param_block.c	2001/10/07 19:04:25	1.1
+++ param_block.c	2001/10/07 19:34:17	1.2
@@ -32,15 +32,15 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "types.h"
-#include "param_block.h"
-#include "main.h"
-#include "flash.h"
-#include "util.h"
-#include "sa1100.h"
+#include <blob/types.h>
+#include <blob/param_block.h>
+#include <blob/main.h>
+#include <blob/flash.h>
+#include <blob/util.h>
+#include <blob/sa1100.h>
 
 
 

Index: reboot.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/reboot.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- reboot.c	2001/10/07 19:04:25	1.1
+++ reboot.c	2001/10/07 19:34:17	1.2
@@ -24,14 +24,14 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "command.h"
-#include "main.h"
-#include "serial.h"
-#include "sa1100.h"
-#include "time.h"
+#include <blob/command.h>
+#include <blob/main.h>
+#include <blob/serial.h>
+#include <blob/sa1100.h>
+#include <blob/time.h>
 
 
 

Index: testmem2.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/testmem2.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- testmem2.S	2001/10/07 19:04:25	1.1
+++ testmem2.S	2001/10/07 19:34:17	1.2
@@ -26,7 +26,7 @@
 .ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <blob/config.h>
 #endif
 
 .text

Index: trampoline.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/trampoline.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- trampoline.S	2001/10/07 19:04:25	1.1
+++ trampoline.S	2001/10/07 19:34:17	1.2
@@ -22,7 +22,7 @@
 .ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include <blob/config.h>
 #endif
 	
 .text

Index: uucodec.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/uucodec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- uucodec.c	2001/10/07 19:04:25	1.1
+++ uucodec.c	2001/10/07 19:34:17	1.2
@@ -34,12 +34,12 @@
 #ident "$Id$"
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <blob/config.h>
 #endif
 
-#include "errno.h"
-#include "serial.h"
-#include "util.h"
+#include <blob/errno.h>
+#include <blob/serial.h>
+#include <blob/util.h>