summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/mips/csb350
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-12-23 18:18:56 +1100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-25 08:45:26 +0100
commit2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch)
tree44759efe9374f13200a97e96d91bd9a2b7e5ce2a /c/src/lib/libbsp/mips/csb350
parentMAINTAINERS: Add myself to Write After Approval. (diff)
downloadrtems-2afb22b7e1ebcbe40373ff7e0efae7d207c655a9.tar.bz2
Remove make preinstall
A speciality of the RTEMS build system was the make preinstall step. It copied header files from arbitrary locations into the build tree. The header files were included via the -Bsome/build/tree/path GCC command line option. This has at least seven problems: * The make preinstall step itself needs time and disk space. * Errors in header files show up in the build tree copy. This makes it hard for editors to open the right file to fix the error. * There is no clear relationship between source and build tree header files. This makes an audit of the build process difficult. * The visibility of all header files in the build tree makes it difficult to enforce API barriers. For example it is discouraged to use BSP-specifics in the cpukit. * An introduction of a new build system is difficult. * Include paths specified by the -B option are system headers. This may suppress warnings. * The parallel build had sporadic failures on some hosts. This patch removes the make preinstall step. All installed header files are moved to dedicated include directories in the source tree. Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc, etc. Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g. erc32, imx, qoriq, etc. The new cpukit include directories are: * cpukit/include * cpukit/score/cpu/@RTEMS_CPU@/include * cpukit/libnetworking The new BSP include directories are: * bsps/include * bsps/@RTEMS_CPU@/include * bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include There are build tree include directories for generated files. The include directory order favours the most general header file, e.g. it is not possible to override general header files via the include path order. The "bootstrap -p" option was removed. The new "bootstrap -H" option should be used to regenerate the "headers.am" files. Update #3254.
Diffstat (limited to 'c/src/lib/libbsp/mips/csb350')
-rw-r--r--c/src/lib/libbsp/mips/csb350/Makefile.am18
-rw-r--r--c/src/lib/libbsp/mips/csb350/configure.ac3
-rw-r--r--c/src/lib/libbsp/mips/csb350/include/bsp.h47
-rw-r--r--c/src/lib/libbsp/mips/csb350/include/irq.h123
-rw-r--r--c/src/lib/libbsp/mips/csb350/include/tm27.h48
-rw-r--r--c/src/lib/libbsp/mips/csb350/preinstall.am83
-rw-r--r--c/src/lib/libbsp/mips/csb350/startup/bsp_specs (renamed from c/src/lib/libbsp/mips/csb350/bsp_specs)0
7 files changed, 6 insertions, 316 deletions
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index 33ec193629..fba96dc185 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -4,21 +4,9 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-include_bsp_HEADERS = ../shared/liblnk/regs.h
#isr
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -28,7 +16,7 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-dist_project_lib_DATA += startup/linkcmds
+project_lib_DATA += linkcmds
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -76,5 +64,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/mips/csb350/headers.am
diff --git a/c/src/lib/libbsp/mips/csb350/configure.ac b/c/src/lib/libbsp/mips/csb350/configure.ac
index ba49c66884..ca7f3dc11d 100644
--- a/c/src/lib/libbsp/mips/csb350/configure.ac
+++ b/c/src/lib/libbsp/mips/csb350/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-mips-csb350],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/csb350.cfg])
RTEMS_TOP(../../../../../..)
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
+RTEMS_BSP_LINKCMDS
RTEMS_CANONICAL_TARGET_CPU
AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.12.2])
diff --git a/c/src/lib/libbsp/mips/csb350/include/bsp.h b/c/src/lib/libbsp/mips/csb350/include/bsp.h
deleted file mode 100644
index ed503a1faa..0000000000
--- a/c/src/lib/libbsp/mips/csb350/include/bsp.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file
- *
- * This include file contains some definitions specific to the
- * Cogent CSB350 Board.
- */
-
-/*
- * COPYRIGHT (c) 1989-2012.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef LIBBSP_MIPS_CSB350_BSP_H
-#define LIBBSP_MIPS_CSB350_BSP_H
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-#include <libcpu/au1x00.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BSP_FEATURE_IRQ_EXTENSION
-#define BSP_SHARED_HANDLER_SUPPORT 1
-
-/*
- * Network driver configuration
- */
-extern struct rtems_bsdnet_ifconfig *config;
-
-int rtems_au1x00_emac_attach(struct rtems_bsdnet_ifconfig *config,
- int attaching);
-#define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0"
-#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_au1x00_emac_attach
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libbsp/mips/csb350/include/irq.h b/c/src/lib/libbsp/mips/csb350/include/irq.h
deleted file mode 100644
index 4f006fdd5f..0000000000
--- a/c/src/lib/libbsp/mips/csb350/include/irq.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @file
- *
- * @ingroup bsp_interrupt
- *
- * @brief interrupt definitions.
- */
-
-/*
- * COPYRIGHT (c) 1989-2012.
- * On-Line Applications Research Corporation (OAR).
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef LIBBSP_MIPS_AU1X00_IRQ_H
-#define LIBBSP_MIPS_AU1X00_IRQ_H
-
-#ifndef ASM
- #include <rtems.h>
- #include <rtems/irq.h>
- #include <rtems/irq-extension.h>
- #include <rtems/score/mips.h>
-#endif
-
-/**
- * @addtogroup bsp_interrupt
- *
- * @{
- */
-
-/*
- * Interrupt Vector Numbers
- *
- */
-/* MIPS_INTERRUPT_BASE should be 32 (0x20) */
-#define BSP_INTERRUPT_VECTOR_MIN 0
-#define AU1X00_IRQ_SW0 (MIPS_INTERRUPT_BASE + 0)
-#define AU1X00_IRQ_SW1 (MIPS_INTERRUPT_BASE + 1)
-#define AU1X00_IRQ_IC0_REQ0 (MIPS_INTERRUPT_BASE + 2)
-#define AU1X00_IRQ_IC0_REQ1 (MIPS_INTERRUPT_BASE + 3)
-#define AU1X00_IRQ_IC1_REQ0 (MIPS_INTERRUPT_BASE + 4)
-#define AU1X00_IRQ_IC1_REQ1 (MIPS_INTERRUPT_BASE + 5)
-#define AU1X00_IRQ_PERF (MIPS_INTERRUPT_BASE + 6)
-#define AU1X00_IRQ_CNT (MIPS_INTERRUPT_BASE + 7)
-
-#define AU1X00_IRQ_IC0_BASE (MIPS_INTERRUPT_BASE + 8)
-#define AU1X00_IRQ_UART0 (MIPS_INTERRUPT_BASE + 8)
-#define AU1X00_IRQ_INTA (MIPS_INTERRUPT_BASE + 9)
-#define AU1X00_IRQ_INTB (MIPS_INTERRUPT_BASE + 10)
-#define AU1X00_IRQ_UART3 (MIPS_INTERRUPT_BASE + 11)
-#define AU1X00_IRQ_INTC (MIPS_INTERRUPT_BASE + 12)
-#define AU1X00_IRQ_INTD (MIPS_INTERRUPT_BASE + 13)
-#define AU1X00_IRQ_DMA0 (MIPS_INTERRUPT_BASE + 14)
-#define AU1X00_IRQ_DMA1 (MIPS_INTERRUPT_BASE + 15)
-#define AU1X00_IRQ_DMA2 (MIPS_INTERRUPT_BASE + 16)
-#define AU1X00_IRQ_DMA3 (MIPS_INTERRUPT_BASE + 17)
-#define AU1X00_IRQ_DMA4 (MIPS_INTERRUPT_BASE + 18)
-#define AU1X00_IRQ_DMA5 (MIPS_INTERRUPT_BASE + 19)
-#define AU1X00_IRQ_DMA6 (MIPS_INTERRUPT_BASE + 20)
-#define AU1X00_IRQ_DMA7 (MIPS_INTERRUPT_BASE + 21)
-#define AU1X00_IRQ_TOY_TICK (MIPS_INTERRUPT_BASE + 22)
-#define AU1X00_IRQ_TOY_MATCH0 (MIPS_INTERRUPT_BASE + 23)
-#define AU1X00_IRQ_TOY_MATCH1 (MIPS_INTERRUPT_BASE + 24)
-#define AU1X00_IRQ_TOY_MATCH2 (MIPS_INTERRUPT_BASE + 25)
-#define AU1X00_IRQ_RTC_TICK (MIPS_INTERRUPT_BASE + 26)
-#define AU1X00_IRQ_RTC_MATCH0 (MIPS_INTERRUPT_BASE + 27)
-#define AU1X00_IRQ_RTC_MATCH1 (MIPS_INTERRUPT_BASE + 28)
-#define AU1X00_IRQ_RTC_MATCH2 (MIPS_INTERRUPT_BASE + 29)
-#define AU1X00_IRQ_PCI_ERR (MIPS_INTERRUPT_BASE + 30)
-#define AU1X00_IRQ_RSV0 (MIPS_INTERRUPT_BASE + 31)
-#define AU1X00_IRQ_USB_DEV (MIPS_INTERRUPT_BASE + 32)
-#define AU1X00_IRQ_USB_SUSPEND (MIPS_INTERRUPT_BASE + 33)
-#define AU1X00_IRQ_USB_HOST (MIPS_INTERRUPT_BASE + 34)
-#define AU1X00_IRQ_AC97_ACSYNC (MIPS_INTERRUPT_BASE + 35)
-#define AU1X00_IRQ_MAC0 (MIPS_INTERRUPT_BASE + 36)
-#define AU1X00_IRQ_MAC1 (MIPS_INTERRUPT_BASE + 37)
-#define AU1X00_IRQ_RSV1 (MIPS_INTERRUPT_BASE + 38)
-#define AU1X00_IRQ_AC97_CMD (MIPS_INTERRUPT_BASE + 39)
-
-#define AU1X00_IRQ_IC1_BASE (MIPS_INTERRUPT_BASE + 40)
-#define AU1X00_IRQ_GPIO0 (MIPS_INTERRUPT_BASE + 40)
-#define AU1X00_IRQ_GPIO1 (MIPS_INTERRUPT_BASE + 41)
-#define AU1X00_IRQ_GPIO2 (MIPS_INTERRUPT_BASE + 42)
-#define AU1X00_IRQ_GPIO3 (MIPS_INTERRUPT_BASE + 43)
-#define AU1X00_IRQ_GPIO4 (MIPS_INTERRUPT_BASE + 44)
-#define AU1X00_IRQ_GPIO5 (MIPS_INTERRUPT_BASE + 45)
-#define AU1X00_IRQ_GPIO6 (MIPS_INTERRUPT_BASE + 46)
-#define AU1X00_IRQ_GPIO7 (MIPS_INTERRUPT_BASE + 47)
-#define AU1X00_IRQ_GPIO8 (MIPS_INTERRUPT_BASE + 48)
-#define AU1X00_IRQ_GPIO9 (MIPS_INTERRUPT_BASE + 49)
-#define AU1X00_IRQ_GPIO10 (MIPS_INTERRUPT_BASE + 50)
-#define AU1X00_IRQ_GPIO11 (MIPS_INTERRUPT_BASE + 51)
-#define AU1X00_IRQ_GPIO12 (MIPS_INTERRUPT_BASE + 52)
-#define AU1X00_IRQ_GPIO13 (MIPS_INTERRUPT_BASE + 53)
-#define AU1X00_IRQ_GPIO14 (MIPS_INTERRUPT_BASE + 54)
-#define AU1X00_IRQ_GPIO15 (MIPS_INTERRUPT_BASE + 55)
-#define AU1X00_IRQ_GPIO200 (MIPS_INTERRUPT_BASE + 56)
-#define AU1X00_IRQ_GPIO201 (MIPS_INTERRUPT_BASE + 57)
-#define AU1X00_IRQ_GPIO202 (MIPS_INTERRUPT_BASE + 58)
-#define AU1X00_IRQ_GPIO203 (MIPS_INTERRUPT_BASE + 59)
-#define AU1X00_IRQ_GPIO20 (MIPS_INTERRUPT_BASE + 60)
-#define AU1X00_IRQ_GPIO204 (MIPS_INTERRUPT_BASE + 61)
-#define AU1X00_IRQ_GPIO205 (MIPS_INTERRUPT_BASE + 62)
-#define AU1X00_IRQ_GPIO23 (MIPS_INTERRUPT_BASE + 63)
-#define AU1X00_IRQ_GPIO24 (MIPS_INTERRUPT_BASE + 64)
-#define AU1X00_IRQ_GPIO25 (MIPS_INTERRUPT_BASE + 65)
-#define AU1X00_IRQ_GPIO26 (MIPS_INTERRUPT_BASE + 66)
-#define AU1X00_IRQ_GPIO27 (MIPS_INTERRUPT_BASE + 67)
-#define AU1X00_IRQ_GPIO28 (MIPS_INTERRUPT_BASE + 68)
-#define AU1X00_IRQ_GPIO206 (MIPS_INTERRUPT_BASE + 69)
-#define AU1X00_IRQ_GPIO207 (MIPS_INTERRUPT_BASE + 70)
-#define AU1X00_IRQ_GPIO208_215 (MIPS_INTERRUPT_BASE + 71)
-
-#define AU1X00_MAXIMUM_VECTORS (MIPS_INTERRUPT_BASE + 72)
-
-#define BSP_INTERRUPT_VECTOR_MAX AU1X00_MAXIMUM_VECTORS
-
-/** @} */
-
-#endif /* LIBBSP_MIPS_AU1X00_IRQ_H */
diff --git a/c/src/lib/libbsp/mips/csb350/include/tm27.h b/c/src/lib/libbsp/mips/csb350/include/tm27.h
deleted file mode 100644
index 3a8957d698..0000000000
--- a/c/src/lib/libbsp/mips/csb350/include/tm27.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @file
- */
-
-/*
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#ifndef _RTEMS_TMTEST27
-#error "This is an RTEMS internal file you must not include directly."
-#endif
-
-#ifndef __tm27_h
-#define __tm27_h
-
-#include <bsp/irq.h>
-
-/*
- * Define the interrupt mechanism for Time Test 27
- */
-
-int assert_sw_irw(uint32_t irqnum);
-int negate_sw_irw(uint32_t irqnum);
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) \
- rtems_interrupt_handler_install( \
- AU1X00_IRQ_SW0, "benchmark", 0, (rtems_interrupt_handler)handler, NULL );
-
-#define Cause_tm27_intr() \
- do { \
- assert_sw_irq(0); \
- } while(0)
-
-#define Clear_tm27_intr() \
- do { \
- negate_sw_irq(0); \
- } while(0)
-
-#define Lower_tm27_intr() \
- do { \
- continue;\
- } while(0)
-
-#endif
diff --git a/c/src/lib/libbsp/mips/csb350/preinstall.am b/c/src/lib/libbsp/mips/csb350/preinstall.am
deleted file mode 100644
index 71be6d1258..0000000000
--- a/c/src/lib/libbsp/mips/csb350/preinstall.am
+++ /dev/null
@@ -1,83 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
- $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bsp/regs.h: ../shared/liblnk/regs.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/regs.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/regs.h
-
-$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
-
-$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/bsp/console-polled.h: ../../shared/include/console-polled.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/console-polled.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/console-polled.h
-
-$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/mips/csb350/bsp_specs b/c/src/lib/libbsp/mips/csb350/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/csb350/bsp_specs
+++ b/c/src/lib/libbsp/mips/csb350/startup/bsp_specs