CVS: blob/src/diag system3.c,1.4,1.5

[Stefan E. <se...@us...>]

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

Modified Files:
	system3.c 
Log Message:
- fixes for newer kernels (tested for 2.4.13-ac5-rmk2) due to
  changes in SA-1111.h


Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/diag/system3.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- system3.c	2001/11/05 09:25:31	1.4
+++ system3.c	2001/11/13 13:20:31	1.5
@@ -114,12 +114,12 @@
 	TUCR = TUCR_3_6864MHz;
 
 	/* Now, set up the PLL and RCLK in the SA-1111: */
-	SKCR = SKCR_PLL_BYPASS | SKCR_RDYEN | SKCR_OE_EN;
+	SBI_SKCR = SKCR_PLL_BYPASS | SKCR_RDYEN | SKCR_OE_EN;
 	msleep(100);
-	SKCR = SKCR_PLL_BYPASS | SKCR_RCLKEN | SKCR_RDYEN | SKCR_OE_EN;
+	SBI_SKCR = SKCR_PLL_BYPASS | SKCR_RCLKEN | SKCR_RDYEN | SKCR_OE_EN;
 
 	SerialOutputString( "SA1111 ID: " );
-	SerialOutputHex( SKID );
+	SerialOutputHex( SBI_SKID );
 	SerialOutputString( "\n" );
 
 	/*
@@ -140,7 +140,7 @@
 	GPDR &= ~GPIO_MBREQ;
 	TUCR |= TUCR_MR;
 
-	SMCR = (SMCR_DTIM | SMCR_MBGE |
+	SBI_SMCR = (SMCR_DTIM | SMCR_MBGE |
 		FInsrt(FExtr(MDCNFG, MDCNFG_SA1110_DRAC0), SMCR_DRAC) |
 		((FExtr(MDCNFG, MDCNFG_SA1110_TDL0)==3) ? SMCR_CLAT : 0));
 }
@@ -201,7 +201,7 @@
  * static functions
  */
 
-#if 0
+#if 1
 #define SMC_BASE	0x18000000
 #define	BANK_SELECT		14
 #define LAN91C96_ECOR	0x0
@@ -238,6 +238,7 @@
 	u32	*attr;
 	u16	bank;
 
+	/* 0x1a020000 */
 	attr	= (u32 *)(((u32)base | (1<<25)) + (0x8000*4));
 
 	/* enable the device */