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

2007-12-10 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
* Makefile.am: use shared exception/interrupt support
	from libcpu/powerpc/new-exceptions/bspsupport rather
	than ../shared/vectors , ../shared/irq

2007-12-10	Till Straumann <strauman@slac.stanford.edu>

	* shared/vectors/vectors_entry.S, motorola_powerpc/bsp_specs,
	shared/start/vectors_entry.S: moved vectors_entry.S to
	'start' subdir and made a start file rather than
	element of vectors.rel (it should always be linked but
	won't if it is the sole member of vectors.rel).
This commit is contained in:
Till Straumann
2007-12-11 05:33:15 +00:00
parent 02e6826b75
commit 83d44561a5
3 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
View File

@@ -1,3 +1,17 @@
2007-12-10 Till Straumann <strauman@slac.stanford.edu>
* Makefile.am: use shared exception/interrupt support
from libcpu/powerpc/new-exceptions/bspsupport rather
than ../shared/vectors , ../shared/irq
2007-12-10 Till Straumann <strauman@slac.stanford.edu>
* shared/vectors/vectors_entry.S, motorola_powerpc/bsp_specs,
shared/start/vectors_entry.S: moved vectors_entry.S to
'start' subdir and made a start file rather than
element of vectors.rel (it should always be linked but
won't if it is the sole member of vectors.rel).
2007-12-08 Till Straumann <strauman@slac.stanford.edu> 2007-12-08 Till Straumann <strauman@slac.stanford.edu>
* Makefile.am: merged shared/vme/vme_universe.c and * Makefile.am: merged shared/vme/vme_universe.c and

26
c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
View File

@@ -37,6 +37,12 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $< $(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += rtems_crti.$(OBJEXT) project_lib_DATA += rtems_crti.$(OBJEXT)
EXTRA_DIST += ../../powerpc/shared/start/vectors_entry.S
vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA += vectors_entry.$(OBJEXT)
dist_project_lib_DATA += ../shared/startup/linkcmds dist_project_lib_DATA += ../shared/startup/linkcmds
noinst_PROGRAMS += startup.rel noinst_PROGRAMS += startup.rel
@@ -80,12 +86,13 @@ console_rel_CPPFLAGS = $(AM_CPPFLAGS) $(console_CPPFLAGS)
console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \ include_bsp_HEADERS += ../../powerpc/shared/irq/irq.h \
../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/irq_supp.h \
../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h \
../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h
noinst_PROGRAMS += irq.rel noinst_PROGRAMS += irq.rel
irq_rel_SOURCES = ../../powerpc/shared/irq/irq_init.c ../../powerpc/shared/irq/openpic_i8259_irq.c \ irq_rel_SOURCES = ../../powerpc/shared/irq/irq_init.c ../../powerpc/shared/irq/openpic_i8259_irq.c \
../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.c \ ../../powerpc/shared/irq/i8259.c ../../powerpc/shared/irq/irq.h
../../powerpc/shared/irq/irq_asm.S ../../powerpc/shared/irq/irq.h
irq_rel_CPPFLAGS = $(AM_CPPFLAGS) irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
@@ -127,16 +134,6 @@ residual_rel_SOURCES = ../../powerpc/shared/residual/pnp.h \
residual_rel_CPPFLAGS = $(AM_CPPFLAGS) residual_rel_CPPFLAGS = $(AM_CPPFLAGS)
residual_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) residual_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
include_bsp_HEADERS += ../../powerpc/shared/vectors/vectors.h
noinst_PROGRAMS += vectors.rel
vectors_rel_SOURCES = ../../powerpc/shared/vectors/vectors.h \
../../powerpc/shared/vectors/vectors_init.c \
../../powerpc/shared/vectors/vectors_entry.S \
../../powerpc/shared/vectors/vectors.S
vectors_rel_CPPFLAGS = $(AM_CPPFLAGS)
vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \ include_bsp_HEADERS += ../../shared/vmeUniverse/vmeUniverse.h \
../../shared/vmeUniverse/vme_am_defs.h \ ../../shared/vmeUniverse/vme_am_defs.h \
../../shared/vmeUniverse/VME.h \ ../../shared/vmeUniverse/VME.h \
@@ -160,12 +157,13 @@ vme_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
noinst_LIBRARIES = libbsp.a noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES = libbsp_a_SOURCES =
libbsp_a_LIBADD = startup.rel pclock.rel console.rel irq.rel openpic.rel \ libbsp_a_LIBADD = startup.rel pclock.rel console.rel irq.rel openpic.rel \
pci.rel residual.rel vectors.rel motorola.rel tod.rel vme.rel pci.rel residual.rel motorola.rel tod.rel vme.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 \
../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \ ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel \
../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.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

16
c/src/lib/libbsp/powerpc/motorola_powerpc/preinstall.am
View File

@@ -69,6 +69,10 @@ $(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirst
$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT) $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT) TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
$(PROJECT_LIB)/vectors_entry.$(OBJEXT): vectors_entry.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/vectors_entry.$(OBJEXT)
TMPINSTALL_FILES += $(PROJECT_LIB)/vectors_entry.$(OBJEXT)
$(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(PROJECT_LIB)/linkcmds: ../shared/startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
@@ -89,6 +93,14 @@ $(PROJECT_INCLUDE)/bsp/irq_supp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bsps
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq_supp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq_supp.h
$(PROJECT_INCLUDE)/bsp/vectors.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
$(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h: ../../../libcpu/@RTEMS_CPU@/@exceptions@/bspsupport/ppc_exc_bspsupp.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ppc_exc_bspsupp.h
$(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(PROJECT_INCLUDE)/bsp/motorola.h: ../../powerpc/shared/motorola/motorola.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/motorola.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/motorola.h
@@ -109,10 +121,6 @@ $(PROJECT_INCLUDE)/bsp/pnp.h: ../../powerpc/shared/residual/pnp.h $(PROJECT_INCL
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pnp.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/pnp.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pnp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/pnp.h
$(PROJECT_INCLUDE)/bsp/vectors.h: ../../powerpc/shared/vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
$(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) $(PROJECT_INCLUDE)/bsp/vmeUniverse.h: ../../shared/vmeUniverse/vmeUniverse.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vmeUniverse.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vmeUniverse.h