Changeset 704e371 in rtems


Ignore:
Timestamp:
Sep 15, 2008, 10:05:08 PM (11 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
60e3b00
Parents:
76432f9
Message:

2008-09-15 Joel Sherrill <joel.sherrill@…>

  • Makefile.am, configure.ac, include/bsp.h, include/bspopts.h.in, startup/bspstart.c: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to perform more initialization.
Location:
c/src/lib/libbsp/powerpc/mvme3100
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/mvme3100/ChangeLog

    r76432f9 r704e371  
     12008-09-15      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * Makefile.am, configure.ac, include/bsp.h, include/bspopts.h.in,
     4        startup/bspstart.c: Add use of bsp_get_work_area() in its own file
     5        and rely on BSP Framework to perform more initialization.
     6
    172008-09-10      Joel Sherrill <joel.sherrill@oarcorp.com>
    28
  • c/src/lib/libbsp/powerpc/mvme3100/Makefile.am

    r76432f9 r704e371  
    5858
    5959startup_SOURCES = startup/bspstart.c build_date.c \
    60     startup/misc.c \
     60    startup/misc.c ../../powerpc/shared/startup/bspgetworkarea.c \
    6161    ../../powerpc/shared/startup/pretaskinghook.c \
    6262    ../../powerpc/shared/startup/zerobss.c \
  • c/src/lib/libbsp/powerpc/mvme3100/configure.ac

    r76432f9 r704e371  
    3636 The BSP actually contains the call that enables this.])
    3737
     38RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
     39
    3840# Explicitly list all Makefiles here
    3941AC_CONFIG_FILES([Makefile])
  • c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h

    r76432f9 r704e371  
    2929 */
    3030#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
     31#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
    3132 
    3233#define BSP_INTERRUPT_STACK_SIZE          (16 * 1024)
     
    277278extern unsigned int BSP_mem_size;
    278279/*
    279  * Start of the heap
    280  */
    281 extern unsigned int BSP_heap_start;
    282 /*
    283280 * PCI Bus Frequency
    284281 */
     
    328325#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_tsec_attach
    329326
     327/*
     328 * system init stack and soft ir stack size
     329 */
     330#define BSP_INIT_STACK_SIZE 0x1000
     331
    330332#ifdef __cplusplus
    331333}
  • c/src/lib/libbsp/powerpc/mvme3100/include/bspopts.h.in

    r76432f9 r704e371  
    11/* include/bspopts.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* BSP uses shared logic in bootcard.c */
     4#undef BSP_BOOTCARD_HANDLES_RAM_ALLOCATION
     5
     6/* If defined, then PSIM will put a non-zero pattern into the RTEMS Workspace
     7   and C program heap. This should assist in finding code that assumes memory
     8   starts set to zero. */
     9#undef BSP_DIRTY_MEMORY
    210
    311/* Define to the address where bug reports for this package should be sent. */
  • c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c

    r76432f9 r704e371  
    7171 */
    7272unsigned int BSP_mem_size            = 0;
    73 /*
    74  * Where the heap starts; is used by bsp_pretasking_hook;
    75  */
    76 unsigned int BSP_heap_start          = 0;
    7773/*
    7874 * PCI Bus Frequency
     
    111107}
    112108
    113 /*
    114  * system init stack and soft ir stack size
    115  */
    116 #define INIT_STACK_SIZE 0x1000
    117 #define INTR_STACK_SIZE rtems_configuration_get_interrupt_stack_size()
    118109
    119110BSP_output_char_function_type BSP_output_char = BSP_output_char_via_serial;
     
    239230uint32_t            intrStackStart;
    240231uint32_t            intrStackSize;
    241 unsigned char       *work_space_start;
    242232char                *chpt;
    243233ppc_cpu_id_t        myCpu;
     
    287277         * Initialize the interrupt related settings.
    288278         */
    289         intrStackStart = (uint32_t) __rtems_end + INIT_STACK_SIZE;
    290         intrStackSize = INTR_STACK_SIZE;
    291         BSP_heap_start = intrStackStart + intrStackSize;
     279        intrStackStart = (uint32_t) __rtems_end + BSP_INIT_STACK_SIZE;
     280        intrStackSize = rtems_configuration_get_interrupt_stack_size();
    292281
    293282        /*
     
    434423        _BSP_clear_hostbridge_errors(0 /* enableMCP */, 0/*quiet*/);
    435424
    436         /*
    437          * Set up our hooks
    438          * Make sure libc_init is done before drivers initialized so that
    439          * they can use atexit()
    440          */
    441 
    442         bsp_clicks_per_usec            = BSP_bus_frequency/(BSP_time_base_divisor * 1000);
    443 
    444 #ifdef SHOW_MORE_INIT_SETTINGS
    445         printk("Configuration.work_space_size = %x\n",
    446                         Configuration.work_space_size);
    447 #endif
    448 
    449         work_space_start =
    450                 (unsigned char *)BSP_mem_size - Configuration.work_space_size;
    451 
    452         if ( work_space_start <=
    453                         ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE) {
    454                 printk( "bspstart: Not enough RAM!!!\n" );
    455                 bsp_cleanup();
    456         }
    457 
    458         Configuration.work_space_start = work_space_start;
     425        bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000);
    459426
    460427        /*
Note: See TracChangeset for help on using the changeset viewer.