From: Tim R. <tim...@us...> - 2001-07-07 19:24:44
|
Update of /cvsroot/blob/blob/include In directory usw-pr-cvs1:/tmp/cvs-serv29015/include Modified Files: Tag: blob_1_0_9_hack flash.h main.h types.h Log Message: initial SHANNON patches Index: flash.h =================================================================== RCS file: /cvsroot/blob/blob/include/flash.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- flash.h 2001/06/27 19:47:42 1.1.1.1 +++ flash.h 2001/07/07 19:24:40 1.1.1.1.2.1 @@ -39,10 +39,10 @@ #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_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) @@ -61,21 +61,30 @@ #define MAIN_BLOCK_SIZE (32768 * 4) #define CS0_BASE (0x00000000) -#define CS1_BASE (0x08000000) +#define CS1_BASE (0x08000000) #define INT_FLASH_BASE (RunningFromInternal() ? CS0_BASE : CS1_BASE) #ifdef ASSABET // Assabet settings come from linux/drivers/block/flash_mem.h -#define KERNEL_START 0x10000 -#define KERNEL_LEN 0xc0000 +#define KERNEL_START 0x10000 +#define KERNEL_LEN 0xc0000 #define NUM_KERNEL_BLOCKS (KERNEL_LEN / MAIN_BLOCK_SIZE) #define INITRD_START (KERNEL_START + KERNEL_LEN) #define INITRD_LEN 0x280000 #define NUM_INITRD_BLOCKS (INITRD_LEN / MAIN_BLOCK_SIZE) +#endif + +#ifdef SHANNON +#define KERNEL_START 0x8000 +#define KERNEL_LEN 0xf8000 +#define NUM_KERNEL_BLOCKS (KERNEL_LEN / MAIN_BLOCK_SIZE) +#define INITRD_START (KERNEL_START + KERNEL_LEN) +#define INITRD_LEN 0x280000 +#define NUM_INITRD_BLOCKS (INITRD_LEN / MAIN_BLOCK_SIZE) #else -#define KERNEL_START (INT_FLASH_BASE + 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) +#define KERNEL_LEN (NUM_KERNEL_BLOCKS * MAIN_BLOCK_SIZE) #define INITRD_START (KERNEL_START + KERNEL_LEN) #define NUM_INITRD_BLOCKS (24) #define INITRD_LEN (NUM_INITRD_BLOCKS * MAIN_BLOCK_SIZE) Index: main.h =================================================================== RCS file: /cvsroot/blob/blob/include/main.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- main.h 2001/06/27 19:47:42 1.1.1.1 +++ main.h 2001/07/07 19:24:40 1.1.1.1.2.1 @@ -42,14 +42,22 @@ #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) +#else #define RAMDISK_BLOCK_OFFSET (0x00400000) +#endif #endif #endif Index: types.h =================================================================== RCS file: /cvsroot/blob/blob/include/types.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- types.h 2001/06/27 19:47:42 1.1.1.1 +++ types.h 2001/07/07 19:24:40 1.1.1.1.2.1 @@ -34,21 +34,12 @@ #ifndef BLOB_TYPES_H #define BLOB_TYPES_H - - - typedef unsigned long u32; typedef unsigned short u16; typedef unsigned char u8; - - - #ifndef NULL #define NULL (void *)0 #endif - - - #endif |