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

2009-03-05 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
* include/bsp.h, start/start.S, startup/bspstart.c:
	removed BSP_INIT_STACK_SIZE -- this BSP now also uses
	__stack defined by the linker script for the initial
	stack.
	Removed legacy code (inherited from old mvme2307 BSP
	but not relevant to this one) that tested trapping
	into PPCBug.
This commit is contained in:
Till Straumann
2009-03-05 21:17:55 +00:00
parent 0f2852d08d
commit 05b0c8a6dd
4 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
View File

@@ -1,3 +1,13 @@
2009-03-05 Till Straumann <strauman@slac.stanford.edu>
* include/bsp.h, start/start.S, startup/bspstart.c:
removed BSP_INIT_STACK_SIZE -- this BSP now also uses
__stack defined by the linker script for the initial
stack.
Removed legacy code (inherited from old mvme2307 BSP
but not relevant to this one) that tested trapping
into PPCBug.
2009-03-05 Till Straumann <strauman@slac.stanford.edu>
* startup/misc.c, flash/flashcfg.c, irq/irq_init.c,

5
c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
View File

@@ -318,11 +318,6 @@ rtems_tsec_attach(struct rtems_bsdnet_ifconfig *ifcfg, int attaching);
#define RTEMS_BSP_NETWORK_DRIVER_NAME "tse1"
#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_tsec_attach
/*
* system init stack and soft ir stack size
*/
#define BSP_INIT_STACK_SIZE 0x1000
#ifdef __cplusplus
}
#endif

7
c/src/lib/libbsp/powerpc/mvme3100/start/start.S
View File

@@ -73,11 +73,8 @@ __rtems_entry_point:
mr r6,r28
mr r7,r27
bl save_boot_params
/*
* stack = &__rtems_end + 4096
*/
addis r9,r0, __rtems_end+(4096-PPC_MINIMUM_STACK_FRAME_SIZE)@ha
addi r9,r9, __rtems_end+(4096-PPC_MINIMUM_STACK_FRAME_SIZE)@l
addis r9,r0, (__stack-PPC_MINIMUM_STACK_FRAME_SIZE)@ha
addi r9,r9, (__stack-PPC_MINIMUM_STACK_FRAME_SIZE)@l
/* align down to 16-bytes */
li r5, (CPU_STACK_ALIGNMENT - 1)
andc r1, r9, r5

31
c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
View File

@@ -50,8 +50,6 @@
extern unsigned long __rtems_end[];
extern void BSP_vme_config(void);
SPR_RW(SPRG1)
/*
* Copy Additional boot param passed by boot loader
*/
@@ -263,10 +261,6 @@ VpdBufRec vpdData [] = {
* so that It can be printed without accessing R1.
*/
asm volatile("mr %0, 1":"=r"(stack));
#if 0
stack = ((unsigned char*) __rtems_end) +
INIT_STACK_SIZE - PPC_MINIMUM_STACK_FRAME_SIZE;
#endif
/* tag the bottom */
*((uint32_t*)stack) = 0;
@@ -274,7 +268,7 @@ VpdBufRec vpdData [] = {
/*
* Initialize the interrupt related settings.
*/
intrStackStart = (uint32_t) __rtems_end + BSP_INIT_STACK_SIZE;
intrStackStart = (uint32_t) __rtems_end;
intrStackSize = rtems_configuration_get_interrupt_stack_size();
/*
@@ -375,29 +369,6 @@ VpdBufRec vpdData [] = {
}
#endif
#ifdef TEST_RAW_EXCEPTION_CODE
printk("Testing exception handling Part 1\n");
/*
* Cause a software exception
*/
__asm__ __volatile ("sc");
/*
* Check we can still catch exceptions and return coorectly.
*/
printk("Testing exception handling Part 2\n");
__asm__ __volatile ("sc");
/*
* Somehow doing the above seems to clobber SPRG0 on the mvme2100. The
* interrupt disable mask is stored in SPRG0. Is this a problem?
*/
ppc_interrupt_set_disable_mask( PPC_INTERRUPT_DISABLE_MASK_DEFAULT);
#endif
/* See above */
#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
if ( (chpt = strstr(BSP_commandline_string,"MEMSZ=")) ) {
char *endp;
uint32_t sz;