blob/src flash.c,1.1.1.1.2.7,1.1.1.1.2.8

[Russ D. <ru...@us...>]

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

Modified Files:
      Tag: blob_1_0_9_hack
	flash.c 
Log Message:
Tell blob to use AMD flash for the NESA board

Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/flash.c,v
retrieving revision 1.1.1.1.2.7
retrieving revision 1.1.1.1.2.8
diff -u -r1.1.1.1.2.7 -r1.1.1.1.2.8
--- flash.c	2001/07/23 20:30:54	1.1.1.1.2.7
+++ flash.c	2001/07/23 21:24:56	1.1.1.1.2.8
@@ -115,7 +115,7 @@
 u32	data_from_flash(u32 what);
 u32	data_to_flash(u32 what);
 
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 #define READ_ARRAY	0x00F000F0
 #define UNLOCK1		0x00AA00AA
 #define UNLOCK2		0x00550055
@@ -189,7 +189,7 @@
 	volatile u32	*flashBase;
 	u32	result;
 	int	maxLength, i;		
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 #define READY 1
 #define ERR   2
 	int chip1, chip2;
@@ -240,7 +240,7 @@
 	SerialOutputByte('\n');
 #endif
 
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 	*(u32 *)FLASH_ADDR1 = data_to_flash(UNLOCK1);
 	*(u32 *)FLASH_ADDR2 = data_to_flash(UNLOCK2);
 	*(u32 *)FLASH_ADDR1 = data_to_flash(UNLOCK_BYPASS);
@@ -255,7 +255,7 @@
 		*flashBase = data_to_flash(PGM_SETUP);
 		*flashBase = *source;
 
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 
 		/* This is a pretty similar situation to the erasing status below
 		 * Bit 7 is ~(data bit 7) until the flash is complete. If bit 5
@@ -300,7 +300,7 @@
 		}
 	}
 	
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 	*(u32 *)FLASH_ADDR1 = data_to_flash(READ_ARRAY);
 #endif
 } /* WriteBlocksFromMem */
@@ -314,7 +314,7 @@
 	volatile u32 *writeMe = (u32 *)whichOne;
 	u32	result;
 
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 	int chip1, chip2;
 #endif
 
@@ -324,7 +324,7 @@
 	SerialOutputByte('\n');
 #endif
 	
-#if defined SHANNON
+#if defined SHANNON || defined NESA
 	*(u32 *)FLASH_ADDR1 = data_to_flash(UNLOCK1);
 	*(u32 *)FLASH_ADDR2 = data_to_flash(UNLOCK2);
 	*(u32 *)FLASH_ADDR1 = data_to_flash(ERASE_SETUP);