RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* Makefile.am, include/bsp.h, startup/bspstart.c: Move
	interrupt_stack_size field from CPU Table to Configuration Table.
	Eliminate CPU Table from all ports. Delete references to CPU Table in
	all forms.
This commit is contained in:
Joel Sherrill
2007-12-04 22:21:41 +00:00
parent 2692a2044c
commit afce764d4c
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/powerpc/ep1a/ChangeLog
View File

@@ -1,3 +1,10 @@
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, include/bsp.h, startup/bspstart.c: Move
interrupt_stack_size field from CPU Table to Configuration Table.
Eliminate CPU Table from all ports. Delete references to CPU Table in
all forms.
2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-12-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* startup/bspstart.c: Moved most of the remaining CPU Table fields to * startup/bspstart.c: Moved most of the remaining CPU Table fields to

6
c/src/lib/libbsp/powerpc/ep1a/Makefile.am
View File

@@ -25,9 +25,9 @@ dist_project_lib_DATA += startup/linkcmds
noinst_PROGRAMS += startup.rel noinst_PROGRAMS += startup.rel
startup_rel_SOURCES = startup/bspstart.c ../../shared/bootcard.c \ startup_rel_SOURCES = startup/bspstart.c ../../shared/bootcard.c \
../../shared/bsppost.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
../../powerpc/shared/startup/sbrk.c ../../shared/bspclean.c \ ../../shared/bsplibc.c ../../powerpc/shared/startup/sbrk.c \
../../shared/gnatinstallhandler.c \ ../../shared/bspclean.c ../../shared/gnatinstallhandler.c \
../../powerpc/shared/startup/pgtbl_setup.c \ ../../powerpc/shared/startup/pgtbl_setup.c \
../../powerpc/shared/startup/pgtbl_activate.c \ ../../powerpc/shared/startup/pgtbl_activate.c \
../../powerpc/shared/showbats.c ../../powerpc/shared/showbats.c

1
c/src/lib/libbsp/powerpc/ep1a/include/bsp.h
View File

@@ -29,7 +29,6 @@
*/ */
#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024)
/* fundamental addresses for BSP (CHRPxxx and PREPxxx are from libcpu/io.h) */ /* fundamental addresses for BSP (CHRPxxx and PREPxxx are from libcpu/io.h) */
#define _IO_BASE CHRP_ISA_IO_BASE #define _IO_BASE CHRP_ISA_IO_BASE

18
c/src/lib/libbsp/powerpc/ep1a/startup/bspstart.c
View File

@@ -108,10 +108,9 @@ unsigned int BSP_processor_frequency;
unsigned int BSP_time_base_divisor = 1000; /* XXX - Just a guess */ unsigned int BSP_time_base_divisor = 1000; /* XXX - Just a guess */
/* /*
* system init stack and soft ir stack size * system init stack
*/ */
#define INIT_STACK_SIZE 0x1000 #define INIT_STACK_SIZE 0x1000
#define INTR_STACK_SIZE CONFIGURE_INTERRUPT_STACK_MEMORY
void BSP_panic(char *s) void BSP_panic(char *s)
{ {
@@ -131,11 +130,7 @@ void _BSP_Fatal_error(unsigned int v)
*/ */
extern rtems_configuration_table Configuration; extern rtems_configuration_table Configuration;
rtems_configuration_table BSP_Configuration; rtems_configuration_table BSP_Configuration;
rtems_cpu_table Cpu_table;
char *rtems_progname; char *rtems_progname;
int BSP_FLASH_Disable_writes( int BSP_FLASH_Disable_writes(
@@ -206,7 +201,8 @@ void bsp_pretasking_hook(void)
extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*); extern uint32_t _bsp_sbrk_init(uint32_t, uint32_t*);
heap_start = ((uint32_t) __rtems_end) +INIT_STACK_SIZE + INTR_STACK_SIZE; heap_start = ((uint32_t) __rtems_end) +
INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size();
if (heap_start & (CPU_ALIGNMENT-1)) if (heap_start & (CPU_ALIGNMENT-1))
heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
@@ -369,8 +365,6 @@ void bsp_start( void )
*/ */
Read_ep1a_config_registers( myCpu ); Read_ep1a_config_registers( myCpu );
Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
bsp_clicks_per_usec = BSP_processor_frequency/(BSP_time_base_divisor * 1000); bsp_clicks_per_usec = BSP_processor_frequency/(BSP_time_base_divisor * 1000);
ShowBATS(); ShowBATS();
@@ -400,7 +394,8 @@ ShowBATS();
* some settings below... * some settings below...
*/ */
intrStack = ((uint32_t) __rtems_end) + intrStack = ((uint32_t) __rtems_end) +
INIT_STACK_SIZE + INTR_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE; INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size() -
PPC_MINIMUM_STACK_FRAME_SIZE;
/* make sure it's properly aligned */ /* make sure it's properly aligned */
intrStack &= ~(CPU_STACK_ALIGNMENT-1); intrStack &= ~(CPU_STACK_ALIGNMENT-1);
@@ -456,7 +451,8 @@ ShowBATS();
work_space_start = work_space_start =
(unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; (unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size;
if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE) { if ( work_space_start <= ((unsigned char *)__rtems_end) +
INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size()) {
printk( "bspstart: Not enough RAM!!!\n" ); printk( "bspstart: Not enough RAM!!!\n" );
bsp_cleanup(); bsp_cleanup();
} }