Menu
▾
▴
CVS: blob/include/blob/arch assabet.h,1.3,1.4 brutus.h,1.1,1.2 clart.h,1.2,1.3 h3600.h,1.2,1.3 lart.h,1.1,1.2 nesa.h,1.1,1.2 pleb.h,1.1,1.2 shannon.h,1.1,1.2 system3.h,1.2,1.3
|
From: Erik M. <er...@us...> - 2001-10-31 16:40:48
|
Update of /cvsroot/blob/blob/include/blob/arch In directory usw-pr-cvs1:/tmp/cvs-serv11206 Modified Files: assabet.h brutus.h clart.h h3600.h lart.h nesa.h pleb.h shannon.h system3.h Log Message: Architecture dependent changes: - serial port definition is in arch dependent files - flash layout over here instead of flash.h. note that this is only temporary until I'm done with proper flash partitioning Index: assabet.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/assabet.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- assabet.h 2001/10/29 11:54:55 1.3 +++ assabet.h 2001/10/31 16:40:45 1.4 @@ -33,6 +33,10 @@ #define CPU_SPEED (0x0b) +/* serial port */ +#define USE_SERIAL1 + + /* GPIO for the LED */ #define LED_GPIO (0x00020000) /* GPIO 17 */ @@ -45,9 +49,14 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00800000) +#define BLOB_FLASH_BASE (0x00000000) +#define BLOB_FLASH_LEN (256 * 1024) +#define PARAM_FLASH_BASE (BLOB_FLASH_BASE + BLOB_FLASH_LEN) +#define PARAM_FLASH_LEN (256 * 1024) +#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN) +#define KERNEL_FLASH_LEN (1024 * 1024) +#define RAMDISK_FLASH_BASE (KERNEL_FLASH_BASE + KERNEL_FLASH_LEN) +#define RAMDISK_FLASH_LEN (4 * 1024 * 1024) /* the position of the kernel boot parameters */ @@ -75,5 +84,8 @@ # define MSC2_VALUE 0x42196669 /* 0x2C MCS2 */ # define SMCNFG_VALUE 0xafccafcc /* 0x30 SMCNFG */ #endif + + + #endif Index: brutus.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/brutus.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- brutus.h 2001/10/14 20:24:32 1.1 +++ brutus.h 2001/10/31 16:40:45 1.2 @@ -34,6 +34,10 @@ #define CPU_SPEED (0x0b) +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00000000) /* safe mode: no GPIO, no LED */ @@ -46,9 +50,14 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00400000) +#define BLOB_FLASH_BASE (0x00000000) +#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 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) /* the position of the kernel boot parameters */ Index: clart.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/clart.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- clart.h 2001/10/29 11:36:45 1.2 +++ clart.h 2001/10/31 16:40:45 1.3 @@ -26,29 +26,47 @@ #ifndef BLOB_ARCH_CLART_H #define BLOB_ARCH_CLART_H + + + /* boot CPU speed */ #define CPU_SPEED (0x0b) + +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00800000) /* GPIO 23 */ + /* where do various parts live in RAM */ #define BLOB_RAM_BASE (0xc0100000) #define KERNEL_RAM_BASE (0xC0008000) #define PARAM_RAM_BASE (0xc0110000) #define RAMDISK_RAM_BASE (0xC0400000) + /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00400000) +#define BLOB_FLASH_BASE (0x00000000) +#define BLOB_FLASH_LEN (128 * 1024) +#define PARAM_FLASH_BASE (BLOB_FLASH_BASE + BLOB_FLASH_LEN) +#define PARAM_FLASH_LEN (128 * 1024) +#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN) +#define KERNEL_FLASH_LEN (1024 * 1024) +#define RAMDISK_FLASH_BASE (KERNEL_FLASH_BASE + KERNEL_FLASH_LEN) +#define RAMDISK_FLASH_LEN (4 * 1024 * 1024) + /* the position of the kernel boot parameters */ #define BOOT_PARAMS (0xc0000100) + /* the size (in kbytes) to which the compressed ramdisk expands */ #define RAMDISK_SIZE (8 * 1024) + /* Memory configuration */ #ifdef BLOB_NEED_MEMCONFIG #warning "use defines from memsetup.h for better readability" @@ -66,5 +84,8 @@ # define MSC2_VALUE 0x42196669 /* 0x2C MCS2 */ # define SMCNFG_VALUE 0xafccafcc /* 0x30 SMCNFG */ #endif + + + #endif Index: h3600.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/h3600.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- h3600.h 2001/10/29 11:36:45 1.2 +++ h3600.h 2001/10/31 16:40:45 1.3 @@ -26,10 +26,17 @@ #ifndef BLOB_ARCH_H3600_H #define BLOB_ARCH_H3600_H + + + /* boot CPU speed */ #define CPU_SPEED (0x0a) +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00000000) /* No LED */ @@ -42,9 +49,14 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00800000) +#define BLOB_FLASH_BASE (0x00000000) +#define BLOB_FLASH_LEN (256 * 1024) +#define PARAM_FLASH_BASE (BLOB_FLASH_BASE + BLOB_FLASH_LEN) +#define PARAM_FLASH_LEN (256 * 1024) +#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN) +#define KERNEL_FLASH_LEN (1024 * 1024) +#define RAMDISK_FLASH_BASE (KERNEL_FLASH_BASE + KERNEL_FLASH_LEN) +#define RAMDISK_FLASH_LEN (4 * 1024 * 1024) /* the position of the kernel boot parameters */ @@ -54,6 +66,7 @@ /* the size (in kbytes) to which the compressed ramdisk expands */ #define RAMDISK_SIZE (8 * 1024) + /* Memory configuration */ #ifdef BLOB_NEED_MEMCONFIG #warning "use defines from memsetup.h for better readability" @@ -71,5 +84,8 @@ # define MSC2_VALUE 0x42196669 /* 0x2C MCS2 */ # define SMCNFG_VALUE 0xafccafcc /* 0x30 SMCNFG */ #endif + + + #endif Index: lart.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/lart.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- lart.h 2001/10/14 20:24:32 1.1 +++ lart.h 2001/10/31 16:40:45 1.2 @@ -33,6 +33,10 @@ #define CPU_SPEED (0x0b) +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00800000) /* GPIO 23 */ @@ -45,9 +49,14 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00400000) +#define BLOB_FLASH_BASE (0x00000000) +#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 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) /* the position of the kernel boot parameters */ Index: nesa.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/nesa.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nesa.h 2001/10/14 20:24:32 1.1 +++ nesa.h 2001/10/31 16:40:45 1.2 @@ -34,6 +34,10 @@ #define CPU_SPEED (0x0b) +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00800000) /* GPIO 23 */ @@ -46,9 +50,15 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00400000) +#warning "Please check NESA default flash layout!" +#define BLOB_FLASH_BASE (0x00000000) +#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 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) /* the position of the kernel boot parameters */ Index: pleb.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/pleb.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pleb.h 2001/10/14 20:24:32 1.1 +++ pleb.h 2001/10/31 16:40:45 1.2 @@ -34,6 +34,10 @@ #define CPU_SPEED (0x0a) +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00010000) /* GPIO 16 */ @@ -46,9 +50,15 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00400000) +#warning "Please check PLEB default flash layout!" +#define BLOB_FLASH_BASE (0x00000000) +#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 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) /* the position of the kernel boot parameters */ Index: shannon.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/shannon.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- shannon.h 2001/10/14 20:24:32 1.1 +++ shannon.h 2001/10/31 16:40:45 1.2 @@ -34,6 +34,10 @@ #define CPU_SPEED (0x09) +/* serial port */ +#define USE_SERIAL3 + + /* GPIO for the LED */ #define LED_GPIO (0x00000000) /* safe mode: no GPIO, no LED */ @@ -46,9 +50,15 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00200000) +#warning "Please check Shannon default flash layout!" +#define BLOB_FLASH_BASE (0x00000000) +#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 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) /* the position of the kernel boot parameters */ Index: system3.h =================================================================== RCS file: /cvsroot/blob/blob/include/blob/arch/system3.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- system3.h 2001/10/29 11:36:45 1.2 +++ system3.h 2001/10/31 16:40:45 1.3 @@ -35,6 +35,8 @@ # define CPU_SPEED (0x0a) #endif +/* serial port */ +#define USE_SERIAL1 /* GPIO for the LED */ #define LED_GPIO (0x00000400) /* GPIO 10 */ @@ -48,9 +50,15 @@ /* and where do they live in flash */ -#define BLOB_BLOCK_OFFSET (0x00000000) -#define KERNEL_BLOCK_OFFSET (0x00008000) -#define RAMDISK_BLOCK_OFFSET (0x00800000) +#warning "Please check System3 default flash layout!" +#define BLOB_FLASH_BASE (0x00000000) +#define BLOB_FLASH_LEN (256 * 1024) +#define PARAM_FLASH_BASE (BLOB_FLASH_BASE + BLOB_FLASH_LEN) +#define PARAM_FLASH_LEN (256 * 1024) +#define KERNEL_FLASH_BASE (PARAM_FLASH_BASE + PARAM_FLASH_LEN) +#define KERNEL_FLASH_LEN (1024 * 1024) +#define RAMDISK_FLASH_BASE (KERNEL_FLASH_BASE + KERNEL_FLASH_LEN) +#define RAMDISK_FLASH_LEN (4 * 1024 * 1024) /* the position of the kernel boot parameters */ |
