CVS: blob/include/blob/arch idr.h,1.10,1.11

[Tim R. <tim...@us...>]

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

Modified Files:
	idr.h 
Log Message:
14 row, 2 mtd parts on enable-jffs2

Index: idr.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/idr.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- idr.h	19 Apr 2002 20:00:23 -0000	1.10
+++ idr.h	30 Apr 2002 23:29:45 -0000	1.11
@@ -54,9 +54,16 @@
 #define PARAM_FLASH_LEN		(0 * 1024) /* not used yet */
 #define KERNEL_FLASH_BASE	(PARAM_FLASH_BASE + PARAM_FLASH_LEN)
 #define KERNEL_FLASH_LEN	((1024 - 128) * 1024)
-#define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define LOAD_RAMDISK		0 /* leave ramdisk in flash */
+
+#if defined(CONFIG_CRAMFS_SUPPORT) || defined(CONFIG_JFFS2_SUPPORT)
+/* kernel will be read directly from the ramdisk, so locations are the same */
+#define RAMDISK_FLASH_BASE	KERNEL_FLASH_BASE
+#define RAMDISK_FLASH_LEN	(16 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN)
+#else
+#define RAMDISK_FLASH_BASE	(KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
 #define RAMDISK_FLASH_LEN	(16 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN - KERNEL_FLASH_LEN)
+#endif
 
 /* the position of the kernel boot parameters */
 #define BOOT_PARAMS		(0xc0000100)
@@ -67,7 +74,8 @@
 /* Memory configuration */
 #ifdef BLOB_NEED_MEMCONFIG
 #warning "use defines from memsetup.h for better readability"
-#	define MDCNFG_VALUE	0x72347234		/* 0x0  MDCNFG */
+/* #	define MDCNFG_VALUE	0x72347234 */	/* 0x0  MDCNFG  12 rows*/ 
+#	define MDCNFG_VALUE	0x72547254		/* 0x0  MDCNFG 14 rows */
 #	define MDCAS00_VALUE	0x55555557		/* 0x04 MDCAS00 */
 #	define MDCAS01_VALUE	0x55555555		/* 0x08 MDCAS01 */
 #	define MDCAS02_VALUE	0x55555555		/* 0x0c MDCAS02 */