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

2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* mongoosev/duart/Makefile.am: Remove.
	* mongoosev/vectorisrs/Makefile.am: Remove.
	* mongoosev/Makefile.am: Merge-in vectorisrs/Makefile.am,
	duart/Makefile.am.
	* r46xx/vectorisrs/Makefile.am: Remove.
	* r46xx/Makefile.am: Merge-in vectorisrs/Makefile.am.
	* shared/cache/Makefile.am: Remove.
	* shared/interrupts/Makefile.am: Remove.
	* shared/Makefile.am: Merge-in cache/Makefile.am,
	interrupts/Makefile.am.
	* tx39/vectorisrs/Makefile.am: Remove.
	* tx39/Makefile.am: Merge-in vectorisrs/Makefile.am.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2003-12-16 13:17:15 +00:00
parent 4a8754d990
commit 1ba50857e6
12 changed files with 196 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
c/src/lib/libcpu/mips/ChangeLog
View File

@@ -1,3 +1,19 @@
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mongoosev/duart/Makefile.am: Remove.
* mongoosev/vectorisrs/Makefile.am: Remove.
* mongoosev/Makefile.am: Merge-in vectorisrs/Makefile.am,
duart/Makefile.am.
* r46xx/vectorisrs/Makefile.am: Remove.
* r46xx/Makefile.am: Merge-in vectorisrs/Makefile.am.
* shared/cache/Makefile.am: Remove.
* shared/interrupts/Makefile.am: Remove.
* shared/Makefile.am: Merge-in cache/Makefile.am,
interrupts/Makefile.am.
* tx39/vectorisrs/Makefile.am: Remove.
* tx39/Makefile.am: Merge-in vectorisrs/Makefile.am.
* configure.ac: Reflect changes above.
2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* mongoosev/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. * mongoosev/Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES.

6
c/src/lib/libcpu/mips/configure.ac
View File

@@ -34,15 +34,9 @@ AM_CONDITIONAL(mongoosev, test "$RTEMS_CPU_MODEL" = "mongoosev")
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
clock/Makefile clock/Makefile
mongoosev/Makefile mongoosev/Makefile
mongoosev/duart/Makefile
mongoosev/vectorisrs/Makefile
shared/Makefile shared/Makefile
shared/cache/Makefile
shared/interrupts/Makefile
r46xx/Makefile r46xx/Makefile
r46xx/vectorisrs/Makefile
timer/Makefile timer/Makefile
tx39/Makefile tx39/Makefile
tx39/vectorisrs/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

56
c/src/lib/libcpu/mips/mongoosev/Makefile.am
View File

@@ -4,11 +4,56 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = duart vectorisrs EXTRA_DIST =
CLEANDIRS =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
include_mipsdir = $(includedir)/libcpu include_mipsdir = $(includedir)/libcpu
include_mips_HEADERS = include/mongoose-v.h include_mips_HEADERS = include/mongoose-v.h
## duart
include_libchipdir = $(includedir)/libchip
include_libchip_HEADERS = duart/mg5uart.h
duart_C_FILES = duart/mg5uart.c duart/mg5uart_reg.c
EXTRA_DIST += $(duart_C_FILES) duart/README.mguart
duart_rel_OBJECTS = $(duart_C_FILES:duart/%.c=duart/$(ARCH)/%.$(OBJEXT))
duart/$(ARCH)/$(dirstamp):
@$(mkdir_p) duart/$(ARCH)
@: > duart/$(ARCH)/$(dirstamp)
duart/$(ARCH)/%.$(OBJEXT): duart/%.c duart/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
duart/$(ARCH)/mg5uart.rel: $(duart_rel_OBJECTS)
$(make-rel)
CLEANDIRS += duart/o-optimize duart/o-debug
noinst_DATA += duart/$(ARCH)/mg5uart.rel
## vectorisrs
vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
EXTRA_DIST += $(vectorisrs_C_FILES)
vectorisrs_rel_OBJECTS = \
$(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
vectorisrs/$(ARCH)/$(dirstamp):
@$(mkdir_p) vectorisrs/$(ARCH)
@: > vectorisrs/$(ARCH)/$(dirstamp)
vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
$(make-rel)
CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
## --
all-local: $(PREINSTALL_FILES)
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES = PREINSTALL_FILES =
@@ -21,5 +66,12 @@ $(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h $(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mongoose-v.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
include $(top_srcdir)/../../../automake/subdirs.am $(PROJECT_INCLUDE)/libchip/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libchip
@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(PROJECT_INCLUDE)/libchip/mg5uart.h: duart/mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

40
c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
View File

@@ -1,40 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/mg5uart.rel
C_FILES = mg5uart.c mg5uart_reg.c
mg5uart_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(mg5uart_rel_OBJECTS)
$(make-rel)
include_libchipdir = $(includedir)/libchip
include_libchip_HEADERS = mg5uart.h
all-local: $(PREINSTALL_FILES) $(mg5uart_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart_reg.c
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libchip/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libchip
@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(PROJECT_INCLUDE)/libchip/mg5uart.h: mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
include $(top_srcdir)/../../../automake/local.am

27
c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am
View File

@@ -1,27 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/vectorisrs.rel
C_FILES = maxvectors.c vectorisrs.c
vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(vectorisrs_rel_OBJECTS)
$(make-rel)
all-local: $(vectorisrs_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = vectorisrs.c
include $(top_srcdir)/../../../automake/local.am

26
c/src/lib/libcpu/mips/r46xx/Makefile.am
View File

@@ -4,7 +4,29 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = vectorisrs EXTRA_DIST =
CLEANDIRS =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
EXTRA_DIST += $(vectorisrs_C_FILES)
vectorisrs_rel_OBJECTS = \
$(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
vectorisrs/$(ARCH)/$(dirstamp):
@$(mkdir_p) vectorisrs/$(ARCH)
@: > vectorisrs/$(ARCH)/$(dirstamp)
vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
$(make-rel)
CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
## --
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

27
c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am
View File

@@ -1,27 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/vectorisrs.rel
C_FILES = maxvectors.c vectorisrs.c
vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(vectorisrs_rel_OBJECTS)
$(make-rel)
all-local: $(vectorisrs_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = vectorisrs.c
include $(top_srcdir)/../../../automake/local.am

79
c/src/lib/libcpu/mips/shared/Makefile.am
View File

@@ -2,7 +2,82 @@
## $Id$ ## $Id$
## ##
SUBDIRS = cache interrupts EXTRA_DIST =
CLEANDIRS =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
## cache
include_libcpudir = $(includedir)/libcpu
noinst_HEADERS = cache/cache_.h
include_libcpu_HEADERS = ../../shared/include/cache.h
cache_C_FILES = cache/cache.c
common_C_FILES = ../../shared/src/cache_aligned_malloc.c
common_C_FILES += ../../shared/src/cache_manager.c
cache_rel_OBJECTS = $(cache_C_FILES:cache/%.c=cache/$(ARCH)/%.$(OBJEXT))
cache_rel_OBJECTS += \
$(common_C_FILES:../../shared/src/%.c=cache/$(ARCH)/%.$(OBJEXT))
AM_CPPFLAGS += -I$(srcdir)/cache
cache/$(ARCH)/$(dirstamp):
@$(mkdir_p) cache/$(ARCH)
@: > cache/$(ARCH)/$(dirstamp)
cache/$(ARCH)/%.$(OBJEXT): cache/%.c cache/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
cache/$(ARCH)/%.$(OBJEXT): ../../shared/src/%.c cache/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
cache/$(ARCH)/cache.rel: $(cache_rel_OBJECTS)
$(make-rel)
CLEANDIRS += cache/o-optimize cache/o-debug
noinst_DATA += cache/$(ARCH)/cache.rel
## interrupts
interrupts_C_FILES = interrupts/installisrentries.c \
interrupts/vectorexceptions.c
interrupts_S_FILES = interrupts/isr_entries.S
interrupts_rel_OBJECTS = \
$(interrupts_C_FILES:interrupts/%.c=interrupts/$(ARCH)/%.$(OBJEXT)) \
$(interrupts_S_FILES:interrupts/%.S=interrupts/$(ARCH)/%.$(OBJEXT))
if tx39
EXTRA_FLAGS = -DTX39
endif
if mongoosev
EXTRA_FLAGS = -DMONGOOSEV
endif
AM_CPPFLAGS += $(EXTRA_FLAGS)
interrupts/$(ARCH)/$(dirstamp):
@$(mkdir_p) interrupts/$(ARCH)
@: > interrupts/$(ARCH)/$(dirstamp)
interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.c interrupts/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
interrupts/$(ARCH)/%.$(OBJEXT): interrupts/%.S interrupts/$(ARCH)/$(dirstamp)
${CCASCOMPILE} -o $@ -c $<
interrupts/$(ARCH)/interrupts.rel: $(interrupts_rel_OBJECTS)
$(make-rel)
CLEANDIRS += interrupts/o-optimize interrupts/o-debug
noinst_DATA += interrupts/$(ARCH)/interrupts.rel
## --
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/cache.h: ../../shared/include/cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

39
c/src/lib/libcpu/mips/shared/cache/Makefile.am vendored
View File

@@ -1,39 +0,0 @@
##
## $Id$
##
VPATH = @srcdir@:@srcdir@/../../../shared/src
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_libcpudir = $(includedir)/libcpu
noinst_HEADERS = cache_.h
include_libcpu_HEADERS = cache.h
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
AM_CPPFLAGS += -I$(srcdir)
cache.h: $(top_srcdir)/../shared/include/cache.h
cp $< $@
all-local: $(PREINSTALL_FILES) $(OBJS)
CLEANFILES = cache.h
EXTRA_DIST = cache.c cache_.h
PREINSTALL_FILES =
$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
@$(mkdir_p) $(PROJECT_INCLUDE)/libcpu
@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
include $(top_srcdir)/../../../automake/local.am

40
c/src/lib/libcpu/mips/shared/interrupts/Makefile.am
View File

@@ -1,40 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/interrupts.rel
C_FILES = installisrentries.c vectorexceptions.c
S_FILES = isr_entries.S
interrupts_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
$(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
if tx39
EXTRA_FLAGS = -DTX39
endif
if mongoosev
EXTRA_FLAGS = -DMONGOOSEV
endif
AM_CPPFLAGS += $(EXTRA_FLAGS)
$(PGM): $(interrupts_rel_OBJECTS)
$(make-rel)
all-local: $(interrupts_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = maxvectors.c
include $(top_srcdir)/../../../automake/local.am

27
c/src/lib/libcpu/mips/tx39/Makefile.am
View File

@@ -4,11 +4,35 @@
ACLOCAL_AMFLAGS = -I ../../../../../../aclocal ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
SUBDIRS = . vectorisrs EXTRA_DIST =
CLEANDIRS =
noinst_DATA =
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
include_libcpudir = $(includedir)/libcpu include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = include/tx3904.h include_libcpu_HEADERS = include/tx3904.h
## vectorisrs
vectorisrs_C_FILES = vectorisrs/maxvectors.c vectorisrs/vectorisrs.c
EXTRA_DIST += $(vectorisrs_C_FILES)
vectorisrs_rel_OBJECTS = \
$(vectorisrs_C_FILES:vectorisrs/%.c=vectorisrs/$(ARCH)/%.$(OBJEXT))
vectorisrs/$(ARCH)/$(dirstamp):
@$(mkdir_p) vectorisrs/$(ARCH)
@: > vectorisrs/$(ARCH)/$(dirstamp)
vectorisrs/$(ARCH)/%.$(OBJEXT): vectorisrs/%.c vectorisrs/$(ARCH)/$(dirstamp)
${COMPILE} -o $@ -c $<
vectorisrs/$(ARCH)/vectorisrs.rel: $(vectorisrs_rel_OBJECTS)
$(make-rel)
CLEANDIRS += vectorisrs/o-optimize vectorisrs/o-debug
noinst_DATA += vectorisrs/$(ARCH)/vectorisrs.rel
## --
all-local: $(PREINSTALL_FILES) all-local: $(PREINSTALL_FILES)
PREINSTALL_FILES = PREINSTALL_FILES =
@@ -21,5 +45,4 @@ $(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am include $(top_srcdir)/../../../automake/local.am

27
c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am
View File

@@ -1,27 +0,0 @@
##
## $Id$
##
PGM = $(ARCH)/vectorisrs.rel
C_FILES = maxvectors.c vectorisrs.c
vectorisrs_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
$(PGM): $(vectorisrs_rel_OBJECTS)
$(make-rel)
all-local: $(vectorisrs_rel_OBJECTS) $(PGM)
.PRECIOUS: $(PGM)
EXTRA_DIST = vectorisrs.c
include $(top_srcdir)/../../../automake/local.am