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/rbtx4938/Makefile.am | 8 +++++--- c/src/lib/libbsp/mips/rbtx4938/make/custom/rbtx4938.cfg | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'c/src/lib/libbsp/mips/rbtx4938') 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