CVS: blob/include/blob sa1100.h,1.3,1.4 bitfield.h,1.1,NONE

[Christopher H. <ch...@us...>]

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

Modified Files:
	sa1100.h 
Removed Files:
	bitfield.h 
Log Message:
revert to 1.2

Index: sa1100.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/sa1100.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sa1100.h	25 Jul 2002 17:30:01 -0000	1.3
+++ sa1100.h	26 Jul 2002 07:17:01 -0000	1.4
@@ -1,6 +1,5 @@
 /*
- * sa1100.h: Defines and macros for accessing the SA1100. Created from
- * the kernel source.
+ * sa1100.h: wrapper file to include asm/arch-sa1100/SA-1100.h
  *
  * Copyright (C) 2001  Erik Mouw (J.A...@it...)
  *
@@ -25,1860 +24,11 @@
 #ifndef BLOB_SA1100_H
 #define BLOB_SA1100_H
 
[...1842 lines suppressed...]
-#define LCCR3_OutEnL	(LCCR3_OEP*1)	/*  Output Enable active Low       */
-
-#define CPU_REVISION	(processor_id & 15)
-#define CPU_SA1110_A0	(0)
-#define CPU_SA1110_B0	(4)
-#define CPU_SA1110_B1	(5)
-#define CPU_SA1110_B2	(6)
-#define CPU_SA1110_B4	(8)
+#define io_p2v(x) (x)
+#define __REG(x)      (*((volatile u32 *)io_p2v(x)))
 
-#define CPU_SA1100_ID	(0x4401a110)
-#define CPU_SA1100_MASK	(0xfffffff0)
-#define CPU_SA1110_ID	(0x6901b110)
-#define CPU_SA1110_MASK	(0xfffffff0)
+/* Tell SA-1100.h to shut up; we're including it anyway. Nyah nyah ;-) */
+#define __ASM_ARCH_HARDWARE_H
+#include <asm-arm/arch-sa1100/SA-1100.h>
 
 #endif

--- bitfield.h DELETED ---