Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv26212/include
Modified Files:
Tag: blob_1_0_9_hack
flash.h main.h
Log Message:
- clean first MB of memory from start.S (this should help to get a .bss
segment)
- download, flash, and reload now know about the "blob" target so you
can upgrade blob without a JTAG dongle
- new command "reboot" to be able to reboot blob after a new version
was flashed
Index: flash.h
===================================================================
RCS file: /cvsroot/blob/blob/include/flash.h,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- flash.h 2001/07/07 21:14:33 1.1.1.1.2.2
+++ flash.h 2001/07/18 23:49:41 1.1.1.1.2.3
@@ -47,7 +47,9 @@
#define BLOCK_IN_USE(x) (x.signature == BLOCK_HDR_SIG)
typedef enum {
- blRamdisk, blKernel
+ blBlob,
+ blKernel,
+ blRamdisk
} tBlockType;
static inline int RunningFromInternal(void) {
@@ -66,6 +68,9 @@
#define INT_FLASH_BASE (RunningFromInternal() ? CS0_BASE : CS1_BASE)
#ifdef ASSABET // Assabet settings come from linux/drivers/block/flash_mem.h
+#define BLOB_START 0x00000
+#define BLOB_LEN 0x10000
+#define NUM_BLOB_BLOCKS (BLOB_LEN / MAIN_BLOCK_SIZE)
#define KERNEL_START 0x10000
#define KERNEL_LEN 0xc0000
#define NUM_KERNEL_BLOCKS (KERNEL_LEN / MAIN_BLOCK_SIZE)
@@ -73,6 +78,9 @@
#define INITRD_LEN 0x280000
#define NUM_INITRD_BLOCKS (INITRD_LEN / MAIN_BLOCK_SIZE)
#elif defined SHANNON
+#define BLOB_START 0x00000
+#define BLOB_LEN 0x8000
+#define NUM_BLOB_BLOCKS (BLOB_LEN / MAIN_BLOCK_SIZE)
#define KERNEL_START 0x8000
#define KERNEL_LEN 0xf8000
#define NUM_KERNEL_BLOCKS (KERNEL_LEN / MAIN_BLOCK_SIZE)
@@ -80,6 +88,9 @@
#define INITRD_LEN 0x280000
#define NUM_INITRD_BLOCKS (INITRD_LEN / MAIN_BLOCK_SIZE)
#else
+#define BLOB_START (INT_FLASH_BASE)
+#define NUM_BLOB_BLOCKS (1)
+#define BLOB_LEN (NUM_BLOB_BLOCKS * MAIN_BLOCK_SIZE)
#define KERNEL_START (INT_FLASH_BASE + MAIN_BLOCK_SIZE)
#define NUM_KERNEL_BLOCKS (7)
#define KERNEL_LEN (NUM_KERNEL_BLOCKS * MAIN_BLOCK_SIZE)
Index: main.h
===================================================================
RCS file: /cvsroot/blob/blob/include/main.h,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- main.h 2001/07/07 19:24:40 1.1.1.1.2.1
+++ main.h 2001/07/18 23:49:41 1.1.1.1.2.2
@@ -34,30 +34,33 @@
#ifndef BLOB_MAIN_H
#define BLOB_MAIN_H
+/* were does blob live when we download it */
+#define BLOB_RAM_BASE (0xC1000000)
+#define BLOB_BLOCK_OFFSET (0x00000000)
+/* were does the kernel live in RAM */
#define KERNEL_RAM_BASE (0xC0008000)
-#ifdef ASSABET
-#define RAMDISK_RAM_BASE (0xC0800000)
-#else
-#ifdef SHANNON
-#define RAMDISK_RAM_BASE (0xC0200000)
-#else
-#define RAMDISK_RAM_BASE (0xC0400000)
-#endif
-#endif
-
#define KERNEL_BLOCK_OFFSET (0x00008000)
-#ifdef ASSABET
-#define RAMDISK_BLOCK_OFFSET (0x00800000)
-#else
-#ifdef SHANNON
-#define RAMDISK_BLOCK_OFFSET (0x00200000)
+
+/* were does the ramdisk live in RAM */
+#if defined ASSABET
+# define RAMDISK_RAM_BASE (0xC0800000)
+#elif defined SHANNON
+# define RAMDISK_RAM_BASE (0xC0200000)
#else
-#define RAMDISK_BLOCK_OFFSET (0x00400000)
+# define RAMDISK_RAM_BASE (0xC0400000)
#endif
+
+#if defined ASSABET
+# define RAMDISK_BLOCK_OFFSET (0x00800000)
+#elif defined SHANNON
+# define RAMDISK_BLOCK_OFFSET (0x00200000)
+#else
+# define RAMDISK_BLOCK_OFFSET (0x00400000)
#endif
+
#endif
|
