From 72510eb2ac44fd2e241e0da0f06535964dcacb6f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 8 May 2009 18:12:31 +0000 Subject: 2009-05-08 Kate Feng * include/bsp.h, start/start.S, startup/bspstart.c: added CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK in bsp.h. removed BSP_INIT_STACK_SIZE in bsp.h -- it uses __stack defined by the linker script (shared/startup/linkcmds) for the initial stack. replaced __rtems_end+4096 with __stack in start.S Removed legacy code in bspstart.c (inherited from old mvme2307 BSP but not relevant to this one) that tested trapping into PPCBug. Changed ConfVPD_buff[] to be static and added ReadConfVPD_buf() in bspstart.c --- c/src/lib/libbsp/powerpc/mvme5500/start/start.S | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/mvme5500/start/start.S') diff --git a/c/src/lib/libbsp/powerpc/mvme5500/start/start.S b/c/src/lib/libbsp/powerpc/mvme5500/start/start.S index eb62d7ed7f..db53b0e89d 100644 --- a/c/src/lib/libbsp/powerpc/mvme5500/start/start.S +++ b/c/src/lib/libbsp/powerpc/mvme5500/start/start.S @@ -125,8 +125,8 @@ enter_C_code: /* * 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 mr r1, r9 /* * We are know in a environment that is totally independent from bootloader setup. @@ -139,11 +139,10 @@ enter_C_code: .type MMUon,@function MMUon: mfmsr r0 -#if (PPC_HAS_FPU == 0) ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1 | MSR_FP +#if (PPC_HAS_FPU == 0) xori r0, r0, MSR_EE | MSR_IP | MSR_FP #else - ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1 | MSR_FP xori r0, r0, MSR_EE | MSR_IP | MSR_FE0 | MSR_FE1 #endif mflr r11 -- cgit v1.2.3