CVS: blob/src/blob chkmem.c,1.3,1.4 flash.c,1.2,1.3 ledasm.S,1.1,1.2 linux.c,1.3,1.4 main.c,1.2,1.3 memory.c,1.2,1.3 reboot.c,1.3,1.4 start.S,1.1,1.2

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

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

Modified Files:
	chkmem.c flash.c ledasm.S linux.c main.c memory.c reboot.c 
	start.S 
Log Message:
Large cleanup of the include files, all platform specific defines are moved
into a single include file in include/blob/arch/ .
*Please* check if the definitions for your platform are still OK.


Index: chkmem.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/chkmem.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- chkmem.c	2001/10/07 23:01:08	1.3
+++ chkmem.c	2001/10/14 20:24:32	1.4
@@ -35,7 +35,7 @@
 # include <blob/config.h>
 #endif
 
-#include <blob/main.h>
+#include <blob/arch.h>
 #include <blob/command.h>
 #include <blob/types.h>
 #include <blob/sa1100.h>

Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- flash.c	2001/10/07 19:34:17	1.2
+++ flash.c	2001/10/14 20:24:32	1.3
@@ -35,10 +35,10 @@
 # include <blob/config.h>
 #endif
 
+#include <blob/arch.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>

Index: ledasm.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/ledasm.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ledasm.S	2001/10/07 15:51:01	1.1
+++ ledasm.S	2001/10/14 20:24:32	1.2
@@ -32,8 +32,7 @@
 # include <blob/config.h>
 #endif
 
-#define ASSEMBLY
-#include <blob/led.h>
+#include <blob/arch.h>
 
 
 

Index: linux.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/linux.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linux.c	2001/10/07 20:53:56	1.3
+++ linux.c	2001/10/14 20:24:32	1.4
@@ -26,12 +26,12 @@
 #endif
 
 #include <blob/linux.h>
+#include <blob/arch.h>
 #include <blob/command.h>
-#include <blob/main.h>
 #include <blob/flash.h>
 #include <blob/init.h>
+#include <blob/main.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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.c	2001/10/07 19:34:17	1.2
+++ main.c	2001/10/14 20:24:32	1.3
@@ -38,6 +38,7 @@
 # include <blob/config.h>
 #endif
 
+#include <blob/arch.h>
 #include <blob/command.h>
 #include <blob/errno.h>
 #include <blob/error.h>

Index: memory.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memory.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- memory.c	2001/10/07 19:34:17	1.2
+++ memory.c	2001/10/14 20:24:32	1.3
@@ -25,7 +25,7 @@
 # include <blob/config.h>
 #endif
 
-#include <blob/main.h>
+#include <blob/arch.h>
 #include <blob/memory.h>
 #include <blob/serial.h>
 

Index: reboot.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/reboot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- reboot.c	2001/10/07 22:36:11	1.3
+++ reboot.c	2001/10/14 20:24:32	1.4
@@ -27,8 +27,8 @@
 # include <blob/config.h>
 #endif
 
+#include <blob/arch.h>
 #include <blob/command.h>
-#include <blob/main.h>
 #include <blob/serial.h>
 #include <blob/sa1100.h>
 #include <blob/time.h>

Index: start.S
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/start.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- start.S	2001/10/07 15:51:01	1.1
+++ start.S	2001/10/14 20:24:32	1.2
@@ -40,6 +40,8 @@
 # include <blob/config.h>
 #endif
 
+#include <blob/arch.h>
+
 .text
 
 /* Jump vector table as in table 3.1 in [1] */
@@ -69,25 +71,13 @@
 #define RCSR	0x04
 
 /* main memory starts at 0xc0000000 */
-MEM_START:	.long	0xc0000000
+MEM_START:	.long	MEMORY_START
 
 
 /* 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.
+ * 190 MHz CPUs are able to run at 221 MHz, 133 MHz CPUs can do 190 Mhz.
  */
-#if (defined ASSABET) || (defined CLART) || (defined LART) || (defined NESA)
-cpuspeed:	.long	0x0b	/* 221 MHz */
-#elif defined PLEB
-cpuspeed:      .long   0x0a    /* 206.4 MHz */
-#elif defined SHANNON
-cpuspeed:	.long	0x09	/* 191.7 MHz */
-#elif defined PT_SYSTEM3
-cpuspeed:	.long	0x05	/* 133 MHz for now */
-#else
-#warning "FIXME: Include code to use the correct clock speed for your board"
-cpuspeed:	.long	0x05	/* safe 133 MHz speed */
-#endif
-
+cpuspeed:	.long	CPU_SPEED