diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-08-15 23:27:57 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2010-08-15 23:27:57 +0000 |
| commit | 6ab0094d98f4e3ee0af0a6c781c1d211da524179 (patch) | |
| tree | dc72b1aae35d5089f5f677d99c5caf4ec1aca3d4 /c/src/lib/libbsp/bfin | |
| parent | Add comment. (diff) | |
| download | rtems-6ab0094d98f4e3ee0af0a6c781c1d211da524179.tar.bz2 | |
2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
* Makefile.am: Do not use .rel files for libbsp pieces.
Diffstat (limited to 'c/src/lib/libbsp/bfin')
| -rw-r--r-- | c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am | 23 | ||||
| -rw-r--r-- | c/src/lib/libbsp/bfin/eZKit533/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/bfin/eZKit533/Makefile.am | 13 |
4 files changed, 19 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog index 7c31f0c8f6..dc645109fb 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog +++ b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog @@ -1,3 +1,7 @@ +2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * Makefile.am: Do not use .rel files for libbsp pieces. + 2010-03-10 Marc Pignat <marc.pignat@hevs.ch> PR 1488/bsps diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am index 34786e13b8..fd138453f6 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -30,19 +30,13 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ ../../shared/bspgetworkarea.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +libbsp_a_SOURCES += console/console.c if HAS_NETWORKING networkconfig_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -52,13 +46,7 @@ networkconfig_rel_CPPFLAGS = $(AM_CPPFLAGS) $(networkconfig_CPPFLAGS) networkconfig_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -libbsp_a_LIBADD = startup.rel console.rel -if HAS_NETWORKING -libbsp_a_LIBADD += networkconfig.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel -endif - -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mmu.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/interrupt.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel @@ -66,6 +54,11 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/clock.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rtc.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/timer.rel +if HAS_NETWORKING +libbsp_a_LIBADD += networkconfig.rel +libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/network.rel +endif + EXTRA_DIST = times include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog index 2ad70e59e5..d16c6d4c43 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog +++ b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog @@ -1,3 +1,7 @@ +2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * Makefile.am: Do not use .rel files for libbsp pieces. + 2009-12-11 Ralf Corsépius <ralf.corsepius@rtems.org> * console/console-io.c: Let eZKit533_BSP_poll_char return int. diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index b8ccd16639..901966c7dc 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -31,22 +31,15 @@ dist_project_lib_DATA += startup/linkcmds noinst_LIBRARIES += libbsp.a libbsp_a_SOURCES = -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ +libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ ../../shared/bspgetworkarea.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console-io.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +libbsp_a_SOURCES += console/console-io.c -libbsp_a_LIBADD = startup.rel console.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/mmu.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mmu.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/interrupt.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/uart.rel |