diff options
Diffstat (limited to '')
4 files changed, 17 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/start/Makefile.am b/c/src/lib/libbsp/powerpc/shared/start/Makefile.am index 13330128b0..e26c892fd6 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S index ee09686659..9f91cb7365 100644 --- a/c/src/lib/libbsp/powerpc/shared/start/start.S +++ b/c/src/lib/libbsp/powerpc/shared/start/start.S @@ -106,8 +106,13 @@ enter_C_code: .type MMUon,@function MMUon: mfmsr r0 - ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1 +#if (PPC_HAS_FPU == 0) + 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_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 mtsrr0 r11 mtsrr1 r0 diff --git a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am index cc1ab757c2..161db96b44 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c index 4ca991e229..c45decac70 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c @@ -73,7 +73,7 @@ unsigned int BSP_time_base_divisor; * system init stack and soft ir stack size */ #define INIT_STACK_SIZE 0x1000 -#define INTR_STACK_SIZE 0x4000 +#define INTR_STACK_SIZE CONFIGURE_INTERRUPT_STACK_MEMORY void BSP_panic(char *s) { @@ -302,12 +302,12 @@ void bsp_start( void ) * they can use atexit() */ - Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ - Cpu_table.postdriver_hook = bsp_postdriver_hook; - Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_stack_size = INTR_STACK_SIZE; - Cpu_table.clicks_per_usec = BSP_processor_frequency/(BSP_time_base_divisor * 1000); - Cpu_table.exceptions_in_RAM = TRUE; + Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ + Cpu_table.postdriver_hook = bsp_postdriver_hook; + Cpu_table.do_zero_of_workspace = TRUE; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; + Cpu_table.clicks_per_usec = BSP_processor_frequency/(BSP_time_base_divisor * 1000); + Cpu_table.exceptions_in_RAM = TRUE; #ifdef SHOW_MORE_INIT_SETTINGS printk("BSP_Configuration.work_space_size = %x\n", BSP_Configuration.work_space_size); @@ -323,11 +323,6 @@ void bsp_start( void ) BSP_Configuration.work_space_start = work_space_start; /* - * Account for the console's resources - */ - - console_reserve_resources( &BSP_Configuration ); - /* * Initalize RTEMS IRQ system */ BSP_rtems_irq_mng_init(0); |