RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* Makefile.am: Do not use intermediate .rel files unless from libcpu or
	a network driver. This simplifies the Makefile.am and avoids pulling
	in unneeded code.
This commit is contained in:
Joel Sherrill
2008-04-17 22:54:45 +00:00
parent 8ae91559e3
commit ed8206bfe8
4 changed files with 45 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am: Do not use intermediate .rel files unless from libcpu or
a network driver. This simplifies the Makefile.am and avoids pulling
in unneeded code.
2008-03-22 Joel Sherrill <joel.sherrill@oarcorp.com> 2008-03-22 Joel Sherrill <joel.sherrill@oarcorp.com>
* configure.ac, startup/exit.c: Add BSP_PRESS_KEY_FOR_RESET * configure.ac, startup/exit.c: Add BSP_PRESS_KEY_FOR_RESET

57
c/src/lib/libbsp/i386/pc386/Makefile.am
View File

@@ -54,58 +54,40 @@ project_lib_DATA += start16.bin
dist_project_lib_DATA += startup/linkcmds dist_project_lib_DATA += startup/linkcmds
noinst_PROGRAMS += clock.rel clock_SOURCES = clock/ckinit.c clock/todcfg.c ../../shared/tod.c
clock_rel_SOURCES = clock/ckinit.c clock/todcfg.c ../../shared/tod.c
clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
include_rtemsdir = $(includedir)/rtems include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = console/keyboard.h console/kd.h \ include_rtems_HEADERS = console/keyboard.h console/kd.h \
console/serial_mouse.h console/ps2_drv.h console/fb_vga.h console/serial_mouse.h console/ps2_drv.h console/fb_vga.h
noinst_PROGRAMS += console.rel
include_HEADERS += ../../i386/shared/comm/i386_io.h include_HEADERS += ../../i386/shared/comm/i386_io.h
console_rel_SOURCES = console/console.c console/inch.c console/outch.c \ console_SOURCES = console/console.c console/inch.c console/outch.c \
console/defkeymap.c console/fb_vga.c console/keyboard.c \ console/defkeymap.c console/fb_vga.c console/keyboard.c \
console/mouse_parser.c console/pc_keyb.c console/ps2_mouse.c \ console/mouse_parser.c console/pc_keyb.c console/ps2_mouse.c \
console/serial_mouse.c console/vgainit.c console/vt.c console/videoAsm.S \ console/serial_mouse.c console/vgainit.c console/vt.c console/videoAsm.S \
../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c ../../i386/shared/comm/uart.c ../../i386/shared/comm/tty_drv.c
console_rel_CPPFLAGS = $(AM_CPPFLAGS)
console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += gdb.rel gdb_SOURCES = ../../i386/shared/comm/i386-stub.c \
gdb_rel_SOURCES = ../../i386/shared/comm/i386-stub.c \
../../i386/shared/comm/i386-stub-glue.c \ ../../i386/shared/comm/i386-stub-glue.c \
../../i386/shared/comm/gdb_glue.c ../../i386/shared/comm/gdb_glue.c
gdb_rel_CPPFLAGS = $(AM_CPPFLAGS)
gdb_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += gnat.rel gnat_SOURCES = ../../shared/gnatinstallhandler.c
gnat_rel_SOURCES = ../../shared/gnatinstallhandler.c
gnat_rel_CPPFLAGS = $(AM_CPPFLAGS)
gnat_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += pci.rel
include_HEADERS += ../../i386/shared/pci/pcibios.h include_HEADERS += ../../i386/shared/pci/pcibios.h
pci_rel_SOURCES = ../../i386/shared/pci/pcibios.c ../../i386/shared/pci/pcibios.h pci_SOURCES = ../../i386/shared/pci/pcibios.c \
pci_rel_CPPFLAGS = $(AM_CPPFLAGS) ../../i386/shared/pci/pcibios.h
pci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += startup.rel
include_HEADERS += ../../i386/shared/comm/uart.h include_HEADERS += ../../i386/shared/comm/uart.h
startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
../../shared/bsppredriverhook.c \ ../../shared/bsppredriverhook.c \
startup/bspstart.c startup/exit.c ../../i386/shared/irq/idt.c \ startup/bspstart.c startup/exit.c ../../i386/shared/irq/idt.c \
../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \ ../../i386/shared/irq/irq.c ../../i386/shared/irq/irq_init.c \
../../shared/bootcard.c ../../shared/sbrk.c \ ../../shared/bootcard.c ../../shared/sbrk.c \
startup/ldsegs.S ../../i386/shared/irq/irq_asm.S startup/ldsegs.S ../../i386/shared/irq/irq_asm.S
startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_PROGRAMS += timer.rel timer_SOURCES = timer/timer.c timer/timerisr.S
timer_rel_SOURCES = timer/timer.c timer/timerisr.S
timer_rel_CPPFLAGS = $(AM_CPPFLAGS) ide_SOURCES = ide/idecfg.c ide/ide.c
timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
if HAS_NETWORKING if HAS_NETWORKING
ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ ne2000_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
@@ -135,23 +117,20 @@ noinst_PROGRAMS += 3c509.rel
3c509_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) 3c509_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif endif
noinst_PROGRAMS += ide.rel
ide_rel_SOURCES = ide/idecfg.c ide/ide.c
ide_rel_CPPFLAGS = $(AM_CPPFLAGS)
ide_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_LIBRARIES = libbsp.a noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES = libbsp_a_SOURCES = $(clock_SOURCES) $(console_SOURCES) $(gdb_SOURCES) \
libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel ide.rel \ $(gnat_SOURCES) $(pci_SOURCES) $(startup_SOURCES) $(timer_SOURCES) \
gdb.rel gnat.rel pci.rel $(ide_SOURCES)
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel \
../../../libcpu/@RTEMS_CPU@/page.rel \
../../../libcpu/@RTEMS_CPU@/score.rel
# We only build the Network library if HAS_NETWORKING was defined # We only build the Network library if HAS_NETWORKING was defined
# dec21140 is supported via libchip # dec21140 is supported via libchip
if HAS_NETWORKING if HAS_NETWORKING
libbsp_a_LIBADD += ne2000.rel wd8003.rel 3c509.rel libbsp_a_LIBADD += ne2000.rel wd8003.rel 3c509.rel
endif endif
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/cache.rel \
../../../libcpu/@RTEMS_CPU@/page.rel \
../../../libcpu/@RTEMS_CPU@/score.rel
EXTRA_DIST += HOWTO README.dec21140 STATUS times_i486dx times_p5 EXTRA_DIST += HOWTO README.dec21140 STATUS times_i486dx times_p5

6
c/src/lib/libbsp/powerpc/psim/ChangeLog
View File

@@ -1,3 +1,9 @@
2008-04-17 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am: Do not use intermediate .rel files unless from libcpu or
a network driver. This simplifies the Makefile.am and avoids pulling
in unneeded code.
2008-03-03 Joel Sherrill <joel.sherrill@OARcorp.com> 2008-03-03 Joel Sherrill <joel.sherrill@OARcorp.com>
* startup/linkcmds: Add wildcard to gcc_except_table section so * startup/linkcmds: Add wildcard to gcc_except_table section so

69
c/src/lib/libbsp/powerpc/psim/Makefile.am
View File

@@ -37,44 +37,22 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
dist_project_lib_DATA += startup/linkcmds dist_project_lib_DATA += startup/linkcmds
noinst_PROGRAMS += startup.rel noinst_LIBRARIES = libbsp.a
startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
startup/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppost.c ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \
startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \ startup/bspstart.c ../../shared/bootcard.c ../../shared/sbrk.c \
../../shared/gnatinstallhandler.c ../../shared/gnatinstallhandler.c
startup_rel_CPPFLAGS = $(AM_CPPFLAGS) pclock_SOURCES = ../shared/clock/p_clock.c
startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) console_SOURCES = ../../shared/console-polled.c
debugio_SOURCES = console/console-io.c console/consupp.S
noinst_PROGRAMS += pclock.rel
pclock_rel_SOURCES = ../shared/clock/p_clock.c
pclock_rel_CPPFLAGS = $(AM_CPPFLAGS)
pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
## Bulk of Console driver with dependencies that entails
noinst_PROGRAMS += console.rel
console_rel_SOURCES = ../../shared/console-polled.c
console_rel_CPPFLAGS = $(AM_CPPFLAGS)
console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
## used for debug IO and bottom of console polled
noinst_PROGRAMS += consoleio.rel
consoleio_rel_SOURCES = console/console-io.c console/consupp.S
consoleio_rel_CPPFLAGS = $(AM_CPPFLAGS)
consoleio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
include_bsp_HEADERS = irq/irq.h include_bsp_HEADERS = irq/irq.h
irq_SOURCES = irq/irq_init.c irq/no_pic.c
noinst_PROGRAMS += irq.rel
irq_rel_SOURCES = irq/irq_init.c irq/no_pic.c
irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
EXTRA_DIST += vectors/README EXTRA_DIST += vectors/README
vectors_SOURCES = vectors/align_h.S
noinst_PROGRAMS += vectors.rel
vectors_rel_SOURCES = vectors/align_h.S
vectors_rel_CPPFLAGS = $(AM_CPPFLAGS)
vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
include_bsp_HEADERS += \ include_bsp_HEADERS += \
../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
@@ -84,17 +62,14 @@ include_bsp_HEADERS += \
if HAS_MP if HAS_MP
EXTRA_DIST += shmsupp/README EXTRA_DIST += shmsupp/README
noinst_PROGRAMS += shmsupp.rel shmdr_SOURCES = \
shmsupp_rel_SOURCES = shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
shmsupp/mpisr.c
shmsupp_rel_CPPFLAGS = $(AM_CPPFLAGS)
shmsupp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
endif endif
noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = $(startup_SOURCES) $(pclock_SOURCES) $(console_SOURCES) \
libbsp_a_SOURCES = $(debugio_SOURCES) $(irq_SOURCES) $(vectors_SOURCES) $(shmdr_SOURCES)
libbsp_a_LIBADD = pclock.rel consoleio.rel console.rel irq.rel vectors.rel
libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/shared/stack.rel \ ../../../libcpu/@RTEMS_CPU@/shared/stack.rel \
../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
@@ -104,19 +79,5 @@ libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \ ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
libbsp_a_LIBADD += \
startup_rel-bspclean.o \
startup_rel-bsplibc.o \
startup_rel-bsppost.o \
startup_rel-bsppredriverhook.o \
startup_rel-bspstart.o \
startup_rel-bootcard.o \
startup_rel-sbrk.o \
startup_rel-gnatinstallhandler.o
if HAS_MP
libbsp_a_LIBADD += shmsupp.rel
endif
include $(srcdir)/preinstall.am include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am include $(top_srcdir)/../../../../automake/local.am