Update of /cvsroot/blob/blob/include/blob/arch
In directory usw-pr-cvs1:/tmp/cvs-serv7626/include/blob/arch
Modified Files:
shannon.h
Log Message:
use load_kernel if any of zimage, jffs2, cramfs are defined
Index: shannon.h
===================================================================
RCS file: /cvsroot/blob/blob/include/blob/arch/shannon.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- shannon.h 17 Apr 2002 05:32:40 -0000 1.11
+++ shannon.h 27 Apr 2002 10:26:49 -0000 1.12
@@ -91,11 +91,18 @@
#define BLOB_FLASH_LEN (64 * 1024)
#define PARAM_FLASH_BASE (BLOB_FLASH_BASE + BLOB_FLASH_LEN)
#define PARAM_FLASH_LEN (64 * 1024)
-#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN)
-#define KERNEL_FLASH_LEN ((1024 - 128) * 1024)
+#define KERNEL_FLASH_LEN ((1024 - 128) * 1024) /* RAM_LEN if load_kernel */
#define LOAD_RAMDISK 0 /* leave ramdisk in flash */
+
+#if defined(CONFIG_CRAMFS_SUPPORT) || defined(CONFIG_JFFS2_SUPPORT)
+#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN)
+#define RAMDISK_FLASH_BASE KERNEL_FLASH_BASE
+#define RAMDISK_FLASH_LEN (4 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN)
+#else
+#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN)
#define RAMDISK_FLASH_BASE (KERNEL_FLASH_BASE + KERNEL_FLASH_LEN)
#define RAMDISK_FLASH_LEN (4 * 1024 * 1024 - BLOB_FLASH_LEN - PARAM_FLASH_LEN - KERNEL_FLASH_LEN)
+#endif
#define PARAM_START PARAM_FLASH_BASE
#define PARAM_LEN PARAM_FLASH_LEN
|
