From e483dc3a6e83b11e5e91affe796d90feda253279 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 31 Jul 2008 18:34:31 +0000 Subject: 2008-07-31 Joel Sherrill * Makefile.am: Do not build .rel files. Reduces code bloat. --- c/src/lib/libbsp/m68k/genmcf548x/ChangeLog | 4 ++ c/src/lib/libbsp/m68k/genmcf548x/Makefile.am | 43 +++++-------- c/src/lib/libbsp/powerpc/haleakala/ChangeLog | 4 ++ c/src/lib/libbsp/powerpc/haleakala/Makefile.am | 55 ++++++---------- c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog | 4 ++ c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am | 83 +++++++++++-------------- 6 files changed, 79 insertions(+), 114 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog index 61fcc3a5b9..54f6c397e2 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog +++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog @@ -1,3 +1,7 @@ +2008-07-31 Joel Sherrill + + * Makefile.am: Do not build .rel files. Reduces code bloat. + 2008-07-17 Joel Sherrill * ChangeLog: Formatting. diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index d869a8dd71..c380cb3b9c 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -25,31 +25,14 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c \ - ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../m68k/shared/m68kpretaskinghook.c \ - startup/init548x.c startup/bspstart.c \ - ../../shared/bootcard.c \ - ../../shared/sbrk.c ../../m68k/shared/setvec.c \ - ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = clock/clock.c -clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += timer.rel -timer_rel_SOURCES = timer/timer.c -timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c ../../m68k/shared/m68kpretaskinghook.c \ + startup/init548x.c startup/bspstart.c ../../shared/bootcard.c \ + ../../shared/sbrk.c ../../m68k/shared/setvec.c \ + ../../shared/gnatinstallhandler.c +clock_SOURCES = clock/clock.c +console_SOURCES = console/console.c +timer_SOURCES = timer/timer.c if HAS_NETWORKING network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -61,13 +44,15 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel + +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ + $(timer_SOURCES) + +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ - ../../../libcpu/@RTEMS_CPU@/shared/misc.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog index eca5f09187..d16265e21a 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/ChangeLog +++ b/c/src/lib/libbsp/powerpc/haleakala/ChangeLog @@ -1,3 +1,7 @@ +2008-07-31 Joel Sherrill + + * Makefile.am: Do not build .rel files. Reduces code bloat. + 2008-07-17 Ralf Corsépius * Makefile.am: Remove reference to startup/setvec.c. diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am index 5ac8822ff9..1b9e216fc8 100644 --- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am +++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am @@ -28,40 +28,24 @@ project_lib_DATA = rtems_crti.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds - -noinst_PROGRAMS += startup.rel -startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ +startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c \ ../../shared/gnatinstallhandler.c -startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -noinst_PROGRAMS += dlentry.rel -dlentry_rel_SOURCES = dlentry/dlentry.S -dlentry_rel_CPPFLAGS = $(AM_CPPFLAGS) -dlentry_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +dlentry_SOURCES = dlentry/dlentry.S -include_bsp_HEADERS = ../../powerpc/shared/console/uart.h -include_bsp_HEADERS += ../../powerpc/shared/console/consoleIo.h - -noinst_PROGRAMS += console.rel -console_rel_SOURCES = ../../powerpc/shared/console/uart.c \ +include_bsp_HEADERS = ../../powerpc/shared/console/uart.h \ + ../../powerpc/shared/console/consoleIo.h +console_SOURCES = ../../powerpc/shared/console/uart.c \ ../../powerpc/shared/console/console.c -console_rel_CPPFLAGS = $(AM_CPPFLAGS) -console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) include_bsp_HEADERS += irq/irq.h \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h - -noinst_PROGRAMS += irq.rel -irq_rel_SOURCES = irq/irq_init.c irq/irq.c -irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) + ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h +irq_SOURCES = irq/irq_init.c irq/irq.c ## if HAS_NETWORKING ## network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ @@ -71,25 +55,22 @@ irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) ## network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) ## endif - noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = +libbsp_a_SOURCES = $(startup_SOURCES) $(dlentry_SOURCES) $(console_SOURCES) \ + $(irq_SOURCES) -libbsp_a_LIBADD = startup.rel dlentry.rel console.rel irq.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel ## if HAS_NETWORKING ## libbsp_a_LIBADD += network.rel ## endif -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \ - ../../../libcpu/@RTEMS_CPU@/@exceptions@/irq_bspsupport.rel \ - ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ - ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel - - EXTRA_DIST += times include $(srcdir)/preinstall.am diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog index 9f13761295..54ecf4c84b 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog @@ -1,3 +1,7 @@ +2008-07-31 Joel Sherrill + + * Makefile.am: Do not build .rel files. Reduces code bloat. + 2008-07-31 Joel Sherrill * tests/tests.c: Remove C++ style comments. diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am index df9d507b0a..3908cadf6c 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am @@ -11,6 +11,8 @@ libcpudir = ../../../libcpu/@RTEMS_CPU@ DISTCLEANFILES = include/bspopts.h +noinst_PROGRAMS = + # Compiler specs dist_project_lib_DATA = bsp_specs @@ -34,55 +36,20 @@ include_HEADERS = include/bsp.h nodist_include_HEADERS = include/bspopts.h ../../shared/tod.h include_bspdir = $(includedir)/bsp include_bsp_HEADERS = include/mpc55xxevb.h \ - include/irq-config.h \ - ../../shared/include/irq-generic.h \ - ../shared/include/tictac.h + include/irq-config.h \ + ../../shared/include/irq-generic.h \ + ../shared/include/tictac.h -# BSP library -noinst_LIBRARIES = libbsp.a -libbsp_a_SOURCES = -libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \ - $(libcpudir)/shared/cache.rel \ - $(libcpudir)/shared/stack.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/misc.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/irq.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/edma.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/dspi.rel \ - $(libcpudir)/@RTEMS_CPU_MODEL@/esci.rel \ - $(libcpudir)/@exceptions@/rtems-cpu.rel \ - $(libcpudir)/@exceptions@/raw_exception.rel \ - $(libcpudir)/@exceptions@/exc_bspsupport.rel - -# Startup -noinst_PROGRAMS = startup.rel -startup_rel_SOURCES = ../../shared/bsplibc.c \ - ../../shared/bsppost.c \ - ../../shared/bootcard.c \ - ../shared/src/tictac.c \ - startup/bspclean.c \ - startup/bspstart.c -startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -libbsp_a_LIBADD += startup.rel - -# Clock -noinst_PROGRAMS += clock.rel -clock_rel_SOURCES = ../shared/clock/clock.c -clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -libbsp_a_LIBADD += clock.rel - -# IRQ -noinst_PROGRAMS += irq-generic.rel -irq_generic_rel_SOURCES = ../../shared/src/irq-generic.c \ - ../../shared/src/irq-legacy.c -irq_generic_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -libbsp_a_LIBADD += irq-generic.rel - -# Tests -noinst_PROGRAMS += tests.rel -tests_rel_SOURCES = tests/tests.c \ - startup/sd-card-init.c -tests_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -libbsp_a_LIBADD += tests.rel +startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ + ../../shared/bootcard.c ../shared/src/tictac.c startup/bspclean.c \ + startup/bspstart.c + +clock_SOURCES = ../shared/clock/clock.c + +irq_generic_SOURCES = ../../shared/src/irq-generic.c \ + ../../shared/src/irq-legacy.c + +tests_SOURCES = tests/tests.c startup/sd-card-init.c # Network if HAS_NETWORKING @@ -90,6 +57,26 @@ noinst_PROGRAMS += network.rel network_rel_SOURCES = network/network.c network_rel_CPPFLAGS = $(AM_CPPFLAGS) -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ -D__BSD_VISIBLE network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +endif + +# BSP library +noinst_LIBRARIES = libbsp.a +libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(irq_generic_SOURCES) \ + $(tests_SOURCES) + +libbsp_a_LIBADD = $(libcpudir)/shared/cpuIdent.rel \ + $(libcpudir)/shared/cache.rel \ + $(libcpudir)/shared/stack.rel \ + $(libcpudir)/@RTEMS_CPU_MODEL@/misc.rel \ + $(libcpudir)/@RTEMS_CPU_MODEL@/irq.rel \ + $(libcpudir)/@RTEMS_CPU_MODEL@/edma.rel \ + $(libcpudir)/@RTEMS_CPU_MODEL@/dspi.rel \ + $(libcpudir)/@RTEMS_CPU_MODEL@/esci.rel \ + $(libcpudir)/@exceptions@/rtems-cpu.rel \ + $(libcpudir)/@exceptions@/raw_exception.rel \ + $(libcpudir)/@exceptions@/exc_bspsupport.rel + +if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif -- cgit v1.2.3