diff options
Diffstat (limited to 'c/src/lib/libcpu')
| -rw-r--r-- | c/src/lib/libcpu/mips/ChangeLog | 12 | ||||
| -rw-r--r-- | c/src/lib/libcpu/mips/configure.in | 1 | ||||
| -rw-r--r-- | c/src/lib/libcpu/mips/shared/interrupts/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/mips/shared/interrupts/maxvectors.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/mips/tx39/Makefile.am | 2 |
5 files changed, 22 insertions, 3 deletions
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog index ba0a4aa02a..298e7c230e 100644 --- a/c/src/lib/libcpu/mips/ChangeLog +++ b/c/src/lib/libcpu/mips/ChangeLog @@ -1,5 +1,17 @@ 2000-12-13 Joel Sherrill <joel@OARcorp.com> + * configure.in: Added new directories. + * shared/interrupts/Makefile.am: Added AM_CPPFLAGS to define TX39 + when compiling for a TX3904. + * shared/interrupts/maxvectors.c: Corrected conditional logic. + * tx39/Makefile.am: Added vectorisrs. + * tx39/vectorisrs/Makefile.am, tx39/vectorisrs/vectorisrs.c, + * tx39/vectorisrs/.cvsignore: New files. This decodes the + interrupt pending information on the TX3904 and vectors + an interrupt. + +2000-12-13 Joel Sherrill <joel@OARcorp.com> + * shared/.cvsignore, shared/Makefile.am, shared/cache/.cvsignore, shared/cache/Makefile.am, shared/cache/cache.c, shared/cache/cache_.h, diff --git a/c/src/lib/libcpu/mips/configure.in b/c/src/lib/libcpu/mips/configure.in index 70e45bc664..a3f3bcea4d 100644 --- a/c/src/lib/libcpu/mips/configure.in +++ b/c/src/lib/libcpu/mips/configure.in @@ -40,4 +40,5 @@ shared/cache/Makefile shared/interrupts/Makefile tx39/Makefile tx39/include/Makefile +tx39/vectorisrs/Makefile timer/Makefile) diff --git a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am index 434f2a38ec..5c9eecf8a8 100644 --- a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am +++ b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am @@ -20,6 +20,12 @@ include $(top_srcdir)/../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # +if tx39 +EXTRA_FLAGS = -DTX39 +endif + +AM_CPPFLAGS += $(EXTRA_FLAGS) + $(PGM): $(interrupts_rel_OBJECTS) $(make-rel) diff --git a/c/src/lib/libcpu/mips/shared/interrupts/maxvectors.c b/c/src/lib/libcpu/mips/shared/interrupts/maxvectors.c index c1e5df20a4..730a1898f2 100644 --- a/c/src/lib/libcpu/mips/shared/interrupts/maxvectors.c +++ b/c/src/lib/libcpu/mips/shared/interrupts/maxvectors.c @@ -18,11 +18,11 @@ * controller so that these four bits map to 16 unique interrupts. * So you have: 2 software interrupts, an NMI, and 16 others. */ -#if defined(tx3904) +#if defined(TX39) #define MAX_VECTORS 19 #endif -#ifndef MAX +#ifndef MAX_VECTORS #define MAX_VECTORS 8 #endif diff --git a/c/src/lib/libcpu/mips/tx39/Makefile.am b/c/src/lib/libcpu/mips/tx39/Makefile.am index 4a691c2fc2..7d3a2077a5 100644 --- a/c/src/lib/libcpu/mips/tx39/Makefile.am +++ b/c/src/lib/libcpu/mips/tx39/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = include +SUBDIRS = include vectorisrs include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am |