Ignore:
Timestamp:
May 15, 2008, 3:54:15 PM (12 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.9, master
Children:
5545002
Parents:
b67a822
Message:

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

  • Makefile.am, configure.ac, startup/bspstart.c: Add capability for bootcard.c BSP Initialization Framework to ask the BSP where it has memory for the RTEMS Workspace and C Program Heap. These collectively are referred to as work area. If the BSP supports this, then it does not have to include code to split the available memory between the two areas. This reduces the amount of code in the BSP specific bspstart.c file. Additionally, the shared framework can initialize the C Library, call rtems_debug_enable(), and dirty the work area memory. Until most/all BSPs support this new capability, if the BSP supports this, it should call RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION from its configure.ac. When the transition is complete, this autoconf macro can be removed.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/leon3/Makefile.am

    rb67a822 r4c94fff  
    3434dist_project_lib_DATA += startup/linkcmds
    3535
    36 noinst_PROGRAMS += startup.rel
    37 startup_rel_SOURCES = ../../sparc/shared/bspclean.c ../../shared/bsplibc.c \
     36startup_SOURCES = ../../sparc/shared/bspclean.c ../../shared/bsplibc.c \
    3837    ../../shared/bsppost.c startup/bspstart.c \
    3938    ../../shared/bootcard.c ../../shared/sbrk.c startup/setvec.c \
    4039    startup/spurious.c startup/ithread.S
    41 startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
    42 startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    4340
    44 noinst_PROGRAMS += gnatsupp.rel
    45 gnatsupp_rel_SOURCES = gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
    46 gnatsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
    47 gnatsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     41gnatsupp_SOURCES = gnatsupp/gnatsupp.c ../../sparc/shared/gnatcommon.c
    4842
    4943include_HEADERS += include/amba.h
    5044include_HEADERS += ../../sparc/shared/include/ambapp.h
    5145
    52 noinst_PROGRAMS += amba.rel
    53 amba_rel_SOURCES = amba/amba.c ../../sparc/shared/amba/ambapp.c
    54 amba_rel_CPPFLAGS = $(AM_CPPFLAGS)
    55 amba_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    56 
    57 noinst_PROGRAMS += console.rel
    58 console_rel_SOURCES = console/console.c
    59 console_rel_CPPFLAGS = $(AM_CPPFLAGS)
    60 console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    61 
    62 noinst_PROGRAMS += debugio.rel
    63 debugio_rel_SOURCES = console/debugputs.c
    64 debugio_rel_CPPFLAGS = $(AM_CPPFLAGS)
    65 debugio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    66 
    67 noinst_PROGRAMS += clock.rel
    68 clock_rel_SOURCES = clock/ckinit.c
    69 clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    70 clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     46amba_SOURCES = amba/amba.c ../../sparc/shared/amba/ambapp.c
     47console_SOURCES = console/console.c
     48debugio_SOURCES = console/debugputs.c
     49clock_SOURCES = clock/ckinit.c
    7150
    7251# PCI
    7352include_HEADERS += ../../sparc/shared/include/pci.h
    74 noinst_PROGRAMS += pci.rel
    75 pci_rel_SOURCES = pci/pci.c ../../sparc/shared/pci/pcifinddevice.c
    76 pci_rel_CPPFLAGS = $(AM_CPPFLAGS)
    77 pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     53pci_SOURCES = pci/pci.c ../../sparc/shared/pci/pcifinddevice.c
    7854
    7955# B1553BRM
    80 include_HEADERS += ../../sparc/shared/include/b1553brm.h ../../sparc/shared/include/b1553brm_pci.h
    81 noinst_PROGRAMS += brm.rel
    82 brm_rel_SOURCES = ../../sparc/shared/1553/b1553brm.c ../../sparc/shared/1553/b1553brm_pci.c
    83 brm_rel_CPPFLAGS = $(AM_CPPFLAGS)
    84 brm_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     56include_HEADERS += ../../sparc/shared/include/b1553brm.h \
     57    ../../sparc/shared/include/b1553brm_pci.h
     58brm_SOURCES = ../../sparc/shared/1553/b1553brm.c \
     59    ../../sparc/shared/1553/b1553brm_pci.c
    8560
    8661# CAN
    87 include_HEADERS += ../../sparc/shared/include/occan.h ../../sparc/shared/include/occan_pci.h ../../sparc/shared/include/grcan.h
    88 noinst_PROGRAMS += can.rel
    89 can_rel_SOURCES = ../../sparc/shared/can/occan.c ../../sparc/shared/can/occan_pci.c  ../../sparc/shared/can/grcan.c
    90 can_rel_CPPFLAGS = $(AM_CPPFLAGS)
    91 can_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     62include_HEADERS += ../../sparc/shared/include/occan.h \
     63    ../../sparc/shared/include/occan_pci.h ../../sparc/shared/include/grcan.h
     64can_SOURCES = ../../sparc/shared/can/occan.c \
     65    ../../sparc/shared/can/occan_pci.c  ../../sparc/shared/can/grcan.c
    9266
    9367# SpaceWire
    94 include_HEADERS += ../../sparc/shared/include/grspw.h ../../sparc/shared/include/grspw_pci.h
    95 noinst_PROGRAMS += spw.rel
    96 spw_rel_SOURCES = ../../sparc/shared/spw/grspw.c ../../sparc/shared/spw/grspw_pci.c
    97 spw_rel_CPPFLAGS = $(AM_CPPFLAGS)
    98 spw_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     68include_HEADERS += ../../sparc/shared/include/grspw.h \
     69    ../../sparc/shared/include/grspw_pci.h
     70spw_SOURCES = ../../sparc/shared/spw/grspw.c \
     71    ../../sparc/shared/spw/grspw_pci.c
    9972
    10073# UART
    101 include_HEADERS += ../../sparc/shared/include/apbuart.h ../../sparc/shared/include/apbuart_pci.h
    102 noinst_PROGRAMS += uart.rel
    103 uart_rel_SOURCES = ../../sparc/shared/uart/apbuart.c ../../sparc/shared/uart/apbuart_pci.c
    104 uart_rel_CPPFLAGS = $(AM_CPPFLAGS)
    105 uart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     74include_HEADERS += ../../sparc/shared/include/apbuart.h \
     75    ../../sparc/shared/include/apbuart_pci.h
     76uart_SOURCES = ../../sparc/shared/uart/apbuart.c \
     77    ../../sparc/shared/uart/apbuart_pci.c
    10678
    10779# I2CMST
    10880include_HEADERS += ../../sparc/shared/include/i2cmst.h
    109 noinst_PROGRAMS += i2cmst.rel
    110 i2cmst_rel_SOURCES = ../../sparc/shared/i2c/i2cmst.c
    111 i2cmst_rel_CPPFLAGS = $(AM_CPPFLAGS)
    112 i2cmst_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
     81i2cmst_SOURCES = ../../sparc/shared/i2c/i2cmst.c
     82
     83timer_SOURCES = timer/timer.c
    11384
    11485if HAS_NETWORKING
     
    11990leon_smc91111_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    12091endif
    121 
    122 noinst_PROGRAMS += timer.rel
    123 timer_rel_SOURCES = timer/timer.c
    124 timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    125 timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    12692
    12793if HAS_NETWORKING
     
    141107endif
    142108
     109if HAS_MP
     110EXTRA_DIST += shmsupp/README
     111shmsupp_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
     112    shmsupp/mpisr.c
     113endif
     114
    143115noinst_LIBRARIES = libbsp.a
    144 libbsp_a_SOURCES =
    145 libbsp_a_LIBADD = startup.rel amba.rel console.rel clock.rel debugio.rel \
    146   timer.rel gnatsupp.rel brm.rel can.rel spw.rel uart.rel pci.rel i2cmst.rel
     116libbsp_a_SOURCES = $(startup_SOURCES) $(gnatsupp_SOURCES) $(amba_SOURCES) \
     117    $(console_SOURCES) $(debugio_SOURCES) $(clock_SOURCES) $(pci_SOURCES) \
     118    $(brm_SOURCES) $(can_SOURCES) $(spw_SOURCES) $(uart_SOURCES) \
     119    $(i2cmst_SOURCES) $(timer_SOURCES) $(shmsupp_SOURCES)
     120
     121libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel \
     122    ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
     123    ../../../libcpu/@RTEMS_CPU@/syscall.rel
    147124
    148125if HAS_NETWORKING
     
    152129endif
    153130
    154 if HAS_MP
    155 EXTRA_DIST += shmsupp/README
    156 
    157 noinst_PROGRAMS += shmsupp.rel
    158 shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \
    159     shmsupp/mpisr.c
    160 shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
    161 shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    162 endif
    163 
    164 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
    165     ../../../libcpu/@RTEMS_CPU@/reg_win.rel \
    166     ../../../libcpu/@RTEMS_CPU@/syscall.rel
    167 
    168 if HAS_MP
    169 libbsp_a_LIBADD += shmsupp.rel
    170 endif
    171 
    172131EXTRA_DIST += times
    173132
Note: See TracChangeset for help on using the changeset viewer.