Update #3285. --- .../mips/shared/irq}/installisrentries.c | 0 .../mips/shared/irq}/isr_entries.S | 0 .../mips => bsps/mips/shared}/timer/gettime.S | 0 .../libcpu/mips => bsps/mips/shared}/timer/timer.c | 0 c/src/lib/libbsp/mips/csb350/Makefile.am | 4 +- .../lib/libbsp/mips/csb350/make/custom/csb350.cfg | 1 - c/src/lib/libbsp/mips/hurricane/Makefile.am | 8 ++-- .../mips/hurricane/make/custom/hurricane.cfg | 2 - c/src/lib/libbsp/mips/jmr3904/Makefile.am | 5 ++- .../libbsp/mips/jmr3904/make/custom/jmr3904.cfg | 1 - c/src/lib/libbsp/mips/malta/Makefile.am | 4 +- c/src/lib/libbsp/mips/malta/make/custom/malta.cfg | 1 - c/src/lib/libbsp/mips/rbtx4925/Makefile.am | 7 ++-- .../libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg | 2 - c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 8 ++-- .../libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg | 2 - c/src/lib/libcpu/mips/Makefile.am | 48 ---------------------- c/src/lib/libcpu/mips/configure.ac | 40 ------------------ .../libcpu/mips/shared/interrupts/interruptmask.c | 20 --------- 19 files changed, 21 insertions(+), 132 deletions(-) rename {c/src/lib/libcpu/mips/shared/interrupts => bsps/mips/shared/irq}/installisrentries.c (100%) rename {c/src/lib/libcpu/mips/shared/interrupts => bsps/mips/shared/irq}/isr_entries.S (100%) rename {c/src/lib/libcpu/mips => bsps/mips/shared}/timer/gettime.S (100%) rename {c/src/lib/libcpu/mips => bsps/mips/shared}/timer/timer.c (100%) delete mode 100644 c/src/lib/libcpu/mips/Makefile.am delete mode 100644 c/src/lib/libcpu/mips/configure.ac delete mode 100644 c/src/lib/libcpu/mips/shared/interrupts/interruptmask.c
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/installisrentries.c b/bsps/mips/shared/irq/installisrentries.c similarity index 100% rename from c/src/lib/libcpu/mips/shared/interrupts/installisrentries.c rename to bsps/mips/shared/irq/installisrentries.c diff --git a/c/src/lib/libcpu/mips/shared/interrupts/isr_entries.S b/bsps/mips/shared/irq/isr_entries.S similarity index 100% rename from c/src/lib/libcpu/mips/shared/interrupts/isr_entries.S rename to bsps/mips/shared/irq/isr_entries.S diff --git a/c/src/lib/libcpu/mips/timer/gettime.S b/bsps/mips/shared/timer/gettime.S similarity index 100% rename from c/src/lib/libcpu/mips/timer/gettime.S rename to bsps/mips/shared/timer/gettime.S diff --git a/c/src/lib/libcpu/mips/timer/timer.c b/bsps/mips/shared/timer/timer.c similarity index 100% rename from c/src/lib/libcpu/mips/timer/timer.c rename to bsps/mips/shared/timer/timer.c diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am index 69c709ce2e..f289195047 100644 --- a/c/src/lib/libbsp/mips/csb350/Makefile.am +++ b/c/src/lib/libbsp/mips/csb350/Makefile.am @@ -54,8 +54,8 @@ libbsp_a_SOURCES += network/network.c endif libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -libbsp_a_LIBADD = ../../../libcpu/mips/shared/interrupts.rel +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/mips/csb350/headers.am diff --git a/c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg b/c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg index ebadadd1f6..f6d50662b0 100644 --- a/c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg +++ b/c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=mips -RTEMS_CPU_MODEL=au1x00 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am index a65d2989c2..8746b969eb 100644 --- a/c/src/lib/libbsp/mips/hurricane/Makefile.am +++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am @@ -18,6 +18,7 @@ project_lib_DATA = start.$(OBJEXT) project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -DRM52XX libbsp_a_SOURCES = # startup @@ -56,9 +57,10 @@ libbsp_a_SOURCES += irq/vectorisrs.c libbsp_a_SOURCES += ../shared/irq/interruptmask.c libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/rm52xx/timer.rel +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/mips/hurricane/headers.am diff --git a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg b/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg index 02d198bfe3..b1c050b966 100644 --- a/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg +++ b/c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg @@ -4,8 +4,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg -RTEMS_CPU_MODEL=rm5231 - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. CPU_CFLAGS = -mips3 -G0 -EL diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index e67e58865f..df52ca3883 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -18,6 +18,7 @@ project_lib_DATA = start.$(OBJEXT) project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -DTX39 libbsp_a_SOURCES = # startup @@ -48,8 +49,8 @@ libbsp_a_SOURCES += irq/vectorisrs.c libbsp_a_SOURCES += ../shared/irq/interruptmask.c libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/mips/jmr3904/headers.am diff --git a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg b/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg index 6b761356da..ed4e6b3be0 100644 --- a/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg +++ b/c/src/lib/libbsp/mips/jmr3904/make/custom/jmr3904.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=mips -RTEMS_CPU_MODEL=tx3904 CPU_CFLAGS = -march=r3900 -Wa,-xgot -G0 diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am index 5349907003..ea431d93be 100644 --- a/c/src/lib/libbsp/mips/malta/Makefile.am +++ b/c/src/lib/libbsp/mips/malta/Makefile.am @@ -55,8 +55,8 @@ libbsp_a_SOURCES += ../../shared/console_control.c libbsp_a_SOURCES += ../../shared/timerstub.c libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S # pci libbsp_a_SOURCES += pci/pci.c diff --git a/c/src/lib/libbsp/mips/malta/make/custom/malta.cfg b/c/src/lib/libbsp/mips/malta/make/custom/malta.cfg index 2bd1eab988..a25abcc911 100644 --- a/c/src/lib/libbsp/mips/malta/make/custom/malta.cfg +++ b/c/src/lib/libbsp/mips/malta/make/custom/malta.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=mips -RTEMS_CPU_MODEL=mips24kf # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am index 74c8303492..446d0535ed 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am @@ -56,9 +56,10 @@ libbsp_a_SOURCES += irq/vectorisrs.c libbsp_a_SOURCES += ../shared/irq/interruptmask_TX49.c libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/mips/rbtx4925/headers.am diff --git a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg b/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg index 37b1e00443..744fdb4240 100644 --- a/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg +++ b/c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg @@ -4,8 +4,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg -RTEMS_CPU_MODEL=tx4925 - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. CPU_CFLAGS = -mips3 -G0 -EL diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am index 7d29c80d95..efce115736 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am +++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am @@ -20,6 +20,7 @@ project_lib_DATA = start.$(OBJEXT) project_lib_DATA += linkcmds noinst_LIBRARIES = libbsp.a +libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -DTX49 libbsp_a_SOURCES = # startup @@ -56,9 +57,10 @@ libbsp_a_SOURCES += irq/vectorisrs.c libbsp_a_SOURCES += ../shared/irq/interruptmask_TX49.c libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c - -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/interrupts.rel -libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/tx49/timer.rel +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/installisrentries.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/irq/isr_entries.S +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/timer.c +libbsp_a_SOURCES += ../../../../../../bsps/mips/shared/timer/gettime.S include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/mips/rbtx4938/headers.am diff --git a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg b/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg index a60a8c6307..42cdf17a04 100644 --- a/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg +++ b/c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg @@ -4,8 +4,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg -RTEMS_CPU_MODEL=tx4938 - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. CPU_CFLAGS = -mips3 -G0 -EL diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am deleted file mode 100644 index 8ae999dd28..0000000000 --- a/c/src/lib/libcpu/mips/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -ACLOCAL_AMFLAGS = -I ../../../aclocal - -include $(top_srcdir)/../../../automake/compile.am - -EXTRA_DIST = - -noinst_PROGRAMS = - -## interrupts - -if rm52xx -interrupts_CPPFLAGS = -DRM52XX -endif - -if tx39 -interrupts_CPPFLAGS = -DTX39 -endif - -if tx49 -interrupts_CPPFLAGS = -DTX49 -endif - -noinst_PROGRAMS += shared/interrupts.rel -shared_interrupts_rel_SOURCES = shared/interrupts/installisrentries.c \ - shared/interrupts/isr_entries.S shared/interrupts/isr_entries.h -shared_interrupts_rel_CPPFLAGS = $(AM_CPPFLAGS) $(interrupts_CPPFLAGS) -shared_interrupts_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -if tx39 -endif - -if tx49 -noinst_PROGRAMS += tx49/timer.rel -tx49_timer_rel_SOURCES = timer/timer.c timer/gettime.S -tx49_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -tx49_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - -if au1x00 -endif - -if rm52xx -noinst_PROGRAMS += rm52xx/timer.rel -rm52xx_timer_rel_SOURCES = timer/timer.c timer/gettime.S -rm52xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -rm52xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - -include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/lib/libcpu/mips/configure.ac b/c/src/lib/libcpu/mips/configure.ac deleted file mode 100644 index 6a9e2665d9..0000000000 --- a/c/src/lib/libcpu/mips/configure.ac +++ /dev/null @@ -1,40 +0,0 @@ -## Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.69]) -AC_INIT([rtems-c-src-lib-libcpu-mips],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) -AC_CONFIG_SRCDIR([timer]) -RTEMS_TOP([../../../../..],[../../..]) -RTEMS_SOURCE_TOP -RTEMS_BUILD_TOP - -RTEMS_CANONICAL_TARGET_CPU - -AM_INIT_AUTOMAKE([no-define foreign subdir-objects 1.12.2]) -AM_MAINTAINER_MODE - -RTEMS_ENV_RTEMSBSP - -RTEMS_PROJECT_ROOT - -RTEMS_PROG_CC_FOR_TARGET -AM_PROG_CC_C_O -RTEMS_CANONICALIZE_TOOLS -RTEMS_PROG_CCAS - -AM_CONDITIONAL(tx39, test "$RTEMS_CPU_MODEL" = "tx3904") - -AM_CONDITIONAL(tx49, test "$RTEMS_CPU_MODEL" = "tx4925" \ -|| test "$RTEMS_CPU_MODEL" = "tx4938" ) - -AM_CONDITIONAL(rm52xx, test "$RTEMS_CPU_MODEL" = "rm5231") - -AM_CONDITIONAL(mongoosev, test "$RTEMS_CPU_MODEL" = "mongoosev") - -AM_CONDITIONAL(au1x00, test "$RTEMS_CPU_MODEL" = "au1x00") - -RTEMS_AMPOLISH3 - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -]) -AC_OUTPUT diff --git a/c/src/lib/libcpu/mips/shared/interrupts/interruptmask.c b/c/src/lib/libcpu/mips/shared/interrupts/interruptmask.c deleted file mode 100644 index 9f2b679a77..0000000000 --- a/c/src/lib/libcpu/mips/shared/interrupts/interruptmask.c +++ /dev/null @@ -1,20 +0,0 @@ -#include <rtems.h> - -/* - * This function returns a mask value which is used to select the bits - * in the processor status register that can be set to enable interrupts. - * The mask value should not include the 2 software interrupt enable bits. - */ - -uint32_t mips_interrupt_mask( void ) -{ - uint32_t interrupt_mask; - -#ifdef TX49 - interrupt_mask = 0x00000400; /* Toshiba TX49 processors have a non-standard interrupt mask */ -#else - interrupt_mask = 0x0000fc00; -#endif - - return(interrupt_mask); -} -- 2.12.3 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel