Update of /cvsroot/blob/blob/include
In directory usw-pr-cvs1:/tmp/cvs-serv7940/include
Modified Files:
flash.h main.h serial.h
Added Files:
param_block.h
Log Message:
Paramater block support
***** Error reading new file: [Errno 2] No such file or directory: 'param_block.h'
Index: flash.h
===================================================================
RCS file: /cvsroot/blob/blob/include/flash.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flash.h 2001/08/06 22:44:52 1.2
+++ flash.h 2001/08/31 06:26:59 1.3
@@ -48,6 +48,7 @@
typedef enum {
blBlob,
+ blParam,
blKernel,
blRamdisk
} tBlockType;
@@ -80,7 +81,13 @@
#elif defined SHANNON
#define BLOB_START (INT_FLASH_BASE)
#define NUM_BLOB_BLOCKS (1)
-#define BLOB_LEN (NUM_BLOB_BLOCKS * MAIN_BLOCK_SIZE)
+#define BLOB_LEN (0x8000)
+
+/* FIXME: blob needs te deal with paramater blocks */
+#define PARAM_START (INT_FLASH_BASE + 0x10000)
+#define NUM_PARAM_BLOCKS (1)
+#define PARAM_LEN (0x10000)
+
#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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- main.h 2001/08/29 18:37:35 1.3
+++ main.h 2001/08/31 06:26:59 1.4
@@ -48,6 +48,8 @@
#define BLOB_BLOCK_OFFSET (0x00000000)
+/* where does the paramater list live when we download it */
+#define PARAM_RAM_BASE (0xc0110000)
/* where does the kernel live in RAM */
#define KERNEL_RAM_BASE (0xC0008000)
@@ -82,6 +84,7 @@
#include "types.h"
#include "serial.h"
+#include <asm/setup.h>
typedef enum {
@@ -94,6 +97,9 @@
int kernelSize;
block_source_t kernelType;
+ int paramSize;
+ block_source_t paramType;
+
int ramdiskSize;
block_source_t ramdiskType;
@@ -103,6 +109,13 @@
u32 blockSize;
eBauds downloadSpeed;
+ eBauds terminalSpeed;
+
+ int load_ramdisk;
+ int boot_delay;
+
+ char cmdline[COMMAND_LINE_SIZE];
+
} blob_status_t;
Index: serial.h
===================================================================
RCS file: /cvsroot/blob/blob/include/serial.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- serial.h 2001/06/27 19:47:42 1.1.1.1
+++ serial.h 2001/08/31 06:26:59 1.2
@@ -44,7 +44,8 @@
baud19k2 = 11,
baud38k4 = 5,
baud57k6 = 3,
- baud115k2 = 1
+ baud115k2 = 1,
+ baud230k4 = 0
} eBauds;
|
