CVS: blob/include/blob arch.h,1.3,1.4 linux.h,1.3,1.4 memsetup.h,1.3,1.4 sa1111.h,1.2,1.3

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

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

Modified Files:
	arch.h linux.h memsetup.h sa1111.h 
Log Message:
- Add HP Jornada 720 port (Chris Hoover)
- Add HP Labs Badge4 port (Chris Hoover)
- Slightly change the SA1110 memory setup or otherwise the HP machines
  won't work
- Move SA1111 base address into machine specific include files


Index: arch.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- arch.h	2001/12/16 04:34:03	1.3
+++ arch.h	2001/12/27 18:27:37	1.4
@@ -39,6 +39,8 @@
 /* architecture specific include files */
 #if defined ASSABET
 # include <blob/arch/assabet.h>
+#elif defined BADGE4
+# include <blob/arch/badge4.h>
 #elif defined BRUTUS
 # include <blob/arch/brutus.h>
 #elif defined CLART
@@ -47,6 +49,8 @@
 # include <blob/arch/h3600.h>
 #elif defined IDR
 # include <blob/arch/idr.h>
+#elif defined JORNADA720
+# include <blob/arch/jornada720.h>
 #elif defined LART
 # include <blob/arch/lart.h>
 #elif defined NESA

Index: linux.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/linux.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linux.h	2001/12/16 04:34:03	1.3
+++ linux.h	2001/12/27 18:27:37	1.4
@@ -34,6 +34,8 @@
 
 #if defined ASSABET
 # define ARCH_NUMBER (25)
+#elif defined BADGE4
+# define ARCH_NUMBER (138)
 #elif defined BRUTUS
 # define ARCH_NUMBER (16)
 #elif defined CLART
@@ -42,6 +44,8 @@
 # define ARCH_NUMBER (22)
 #elif defined IDR
 # define ARCH_NUMBER (147)
+#elif defined JORNADA720
+# define ARCH_NUMBER (48)
 #elif defined LART
 # define ARCH_NUMBER (27)
 #elif defined NESA

Index: memsetup.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/memsetup.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- memsetup.h	2001/10/29 11:39:07	1.3
+++ memsetup.h	2001/12/27 18:27:37	1.4
@@ -54,6 +54,16 @@
  *  MDCNFG masks
  */
 
+#define MDCNFG_BANK0_ENABLE (1 << 0)
+#define MDCNFG_BANK1_ENABLE (1 << 1)
+#define MDCNFG_DTIM0_SDRAM  (1 << 2)
+#define MDCNFG_DWID0_32B    (0 << 3)
+#define MDCNFG_DWID0_16B    (1 << 3)
+#define MDCNFG_DRAC0(n_)    (((n_) & 7) << 4)
+#define MDCNFG_TRP0(n_)     (((n_) & 0xF) << 8)
+#define MDCNFG_TDL0(n_)     (((n_) & 3) << 12)
+#define MDCNFG_TWR0(n_)     (((n_) & 3) << 14)
+
 /**********************************************************************
  *  MDREFR masks
  */

Index: sa1111.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/sa1111.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sa1111.h	2001/10/09 19:24:54	1.2
+++ sa1111.h	2001/12/27 18:27:37	1.3
@@ -26,10 +26,10 @@
 #ifndef BLOB_SA1111_H
 #define BLOB_SA1111_H
 
-#ifdef PT_SYSTEM3
-#	define	SA1111_BASE	(0x40000000)
-#else
-#	error	"DEFINE SA1111 BASE ADDRESS!"
+#include <blob/arch.h>
+
+#ifndef SA1111_BASE
+# error "Define SA1111_BASE address in architecture specific include file"
 #endif
 
 #define SA1111_p2v(x) (x)