summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-15 13:11:56 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-15 13:11:56 +0000
commit9e3e2d6edfe80bdb8755fd755e61f40e5a8976fe (patch)
tree55984a748926600ec187fa161d2606e604468f1c
parentPatch rtems-rc-20000615-2-cvs.diff from Ralf Corsepius (diff)
downloadrtems-9e3e2d6edfe80bdb8755fd755e61f40e5a8976fe.tar.bz2
Patch rtems-rc-20000615-3-cvs.diff from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> so these BSPs pick up the components they need from libcpu.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am7
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am7
3 files changed, 9 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am
index fb8ced526d..2ba1a5b8ff 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am
@@ -17,7 +17,7 @@ BSP_PIECES = startup start canbus console $(NETWORKING)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
- $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o)
+ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am
index b098954601..822bba251a 100644
--- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am
@@ -6,11 +6,12 @@ AUTOMAKE_OPTIONS = foreign 1.4
BSP_PIECES = startup dlentry flashentry
# pieces to pick up out of libcpu/ppc
-# CPU_PIECES = ppc403/clock ppc403/timer ppc403/console ppc403/vectors \
-# ppc403/ictrl
+CPU_PIECES = clock timer console vectors ictrl
# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
+
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
index b098954601..822bba251a 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
@@ -6,11 +6,12 @@ AUTOMAKE_OPTIONS = foreign 1.4
BSP_PIECES = startup dlentry flashentry
# pieces to pick up out of libcpu/ppc
-# CPU_PIECES = ppc403/clock ppc403/timer ppc403/console ppc403/vectors \
-# ppc403/ictrl
+CPU_PIECES = clock timer console vectors ictrl
# bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
+ $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
+
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg