CVS: blob/include/blob flash.h,1.4,1.5

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

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

Modified Files:
	flash.h 
Log Message:
More flash cleanup. This includes the new flash write algorithm. Next is
static flash partition support.


Index: flash.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/flash.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flash.h	2001/10/21 21:36:15	1.4
+++ flash.h	2001/10/24 12:28:25	1.5
@@ -75,16 +75,6 @@
 
 /* -------- OLD ---------------------------------------------------- */
 
-#define NUM_FLASH_BLOCKS	(31)
-#define FLASH_BLOCK_BASE	((u32 *) 0x020000)
-#define FLASH_BLOCK_SIZE	((u32) 0x020000)
-#define BLOCK_NAME_LEN	(64)
-#define NO_BLOCK	((u8) 0xFF)
-#define BLOCK_HDR_SIG	((u32) 'LART')
-#define BLOCK_EMPTY_SIG	((u32) 0xFFFFFFFF)
-
-#define BLOCK_IN_USE(x) (x.signature == BLOCK_HDR_SIG)
-
 typedef	enum {
 	blBlob,
 	blParam,
@@ -92,20 +82,9 @@
 	blRamdisk
 } tBlockType;
 
-static inline int RunningFromInternal(void) {
-	
-	if(((*(u32 *)0xA0000010) & 0x04) == 0)
-		return 1;
-	else
-		return 0;
-}
-
 #define MAIN_BLOCK_SIZE	(32768 * 4)
-
-#define CS0_BASE	(0x00000000)
-#define CS1_BASE	(0x08000000)
 
-#define INT_FLASH_BASE (RunningFromInternal() ? CS0_BASE : CS1_BASE)
+#define INT_FLASH_BASE		0x00000000
 
 #ifdef ASSABET  // Assabet settings come from linux/drivers/block/flash_mem.h
 #define BLOB_START		0x00000
@@ -144,10 +123,6 @@
 #define NUM_INITRD_BLOCKS	(24)
 #define INITRD_LEN		(NUM_INITRD_BLOCKS * MAIN_BLOCK_SIZE)
 #endif
-
-
-void EraseBlocks(tBlockType which);
-void WriteBlocksFromMem(tBlockType type, const u32 *source, int length);
 
 
 #endif