From b6755affc05466a49e684c316ea6e6f00c21c370 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 9 Mar 2018 16:45:56 +0100 Subject: bsps/mips: Move libcpu content to bsps This patch is a part of the BSP source reorganization. Update #3285. --- c/src/lib/libbsp/mips/csb350/Makefile.am | 4 ++-- c/src/lib/libbsp/mips/csb350/make/custom/csb350.cfg | 1 - c/src/lib/libbsp/mips/hurricane/Makefile.am | 8 +++++--- c/src/lib/libbsp/mips/hurricane/make/custom/hurricane.cfg | 2 -- c/src/lib/libbsp/mips/jmr3904/Makefile.am | 5 +++-- c/src/lib/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 ++++--- c/src/lib/libbsp/mips/rbtx4925/make/custom/rbtx4925.cfg | 2 -- c/src/lib/libbsp/mips/rbtx4938/Makefile.am | 8 +++++--- c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg | 2 -- 12 files changed, 21 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp/mips') 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 -- cgit v1.2.3