summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/ss555
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/powerpc/ss555
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/powerpc/ss555')
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/Makefile.am17
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/configure.ac3
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/include/bsp.h91
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/include/tm27.h56
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/irq/irq.h66
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/preinstall.am67
-rw-r--r--c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs (renamed from c/src/lib/libbsp/powerpc/ss555/bsp_specs)0
7 files changed, 7 insertions, 293 deletions
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index a2cd12f4f2..afa059e5a3 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -4,28 +4,19 @@ 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
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
-include_bsp_HEADERS = irq/irq.h
-
EXTRA_DIST += times
-dist_project_lib_DATA += startup/linkcmds
-
EXTRA_DIST += ../../powerpc/shared/start/rtems_crti.S
rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = rtems_crti.$(OBJEXT)
+project_lib_DATA += linkcmds
+
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
@@ -55,5 +46,5 @@ libbsp_a_LIBADD = \
../../../libcpu/@RTEMS_CPU@/mpc5xx/timer.rel \
../../../libcpu/@RTEMS_CPU@/mpc5xx/vectors.rel
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/powerpc/ss555/headers.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/configure.ac b/c/src/lib/libbsp/powerpc/ss555/configure.ac
index f586a58bc2..159755d8eb 100644
--- a/c/src/lib/libbsp/powerpc/ss555/configure.ac
+++ b/c/src/lib/libbsp/powerpc/ss555/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/ss555.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/powerpc/ss555/include/bsp.h b/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
deleted file mode 100644
index a82d10a667..0000000000
--- a/c/src/lib/libbsp/powerpc/ss555/include/bsp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file includes definitions for the Intec SS555.
- */
-
-/*
- * SS555 port sponsored by Defence Research and Development Canada - Suffield
- * Copyright (C) 2004, Real-Time Systems Inc. (querbach@realtime.bc.ca)
- *
- * Derived from c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h:
- *
- * COPYRIGHT (c) 1989-1998.
- * 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_POWERPC_SS555_BSP_H
-#define LIBBSP_POWERPC_SS555_BSP_H
-
-#ifndef ASM
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-#include <mpc5xx.h>
-#include <mpc5xx/console.h>
-#include <libcpu/vectors.h>
-#include <bsp/irq.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Clock definitions
- */
-
-#define BSP_CRYSTAL_HZ 4000000 /* crystal frequency, Hz */
-#define BSP_CLOCK_HZ 40000000 /* CPU clock frequency, Hz
-
-/*
- * I/O definitions
- *
- * The SS555 board includes a CPLD to control on-board features and
- * off-board devices.
- */
-typedef struct cpld_ {
- uint8_t cs3a[32]; /* Chip select 3A */
- uint8_t pad0[0x200000 - 0x000020];
-
- uint8_t cs3b[32]; /* Chip select 3B */
- uint8_t pad2[0x400000 - 0x200020];
-
- uint8_t cs3c[32]; /* Chip select 3C */
- uint8_t pad4[0x600000 - 0x400020];
-
- uint8_t cs3d[32]; /* Chip select 3D */
- uint8_t pad6[0x800000 - 0x600020];
-
- uint8_t serial_ints; /* Enable/disable serial interrupts */
- uint8_t serial_resets; /* Enable/disable serial resets */
- uint8_t serial_ack; /* Acknowledge serial transfers */
- uint8_t pad8[0xA00000 - 0x800003];
-
- uint8_t iflash_writess; /* Enable/disable internal-flash writes */
- uint8_t nflash_writess; /* Enable/disable NAND-flash writes */
- uint8_t padA[0xC00000 - 0xA00002];
-} cpld_t;
-
-extern volatile cpld_t cpld; /* defined in linkcmds */
-
-/* clock/p_clock.c */
-extern int BSP_disconnect_clock_handler (void);
-
-extern int BSP_connect_clock_handler (rtems_irq_hdl hdl);
-
-/*
- * Prototypes for methods called from .S to support dependency tracking.
- */
-void _InitSS555(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !ASM */
-
-#endif
diff --git a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h b/c/src/lib/libbsp/powerpc/ss555/include/tm27.h
deleted file mode 100644
index 5106801744..0000000000
--- a/c/src/lib/libbsp/powerpc/ss555/include/tm27.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * @file
- * @ingroup powerpc_ss555
- * @brief Implementations for interrupt mechanisms for Time Test 27
- */
-
-/*
- * 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
-
-/*
- * Stuff for Time Test 27
- *
- * The following require that IRQ7 be jumpered to ground. On the SS555,
- * this can be done by shorting together CN5 pin 48 and CN5 pin 50.
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 1
-
-#define Install_tm27_vector( handler ) \
-{ \
- extern rtems_irq_connect_data tm27IrqData; \
- usiu.siel |= (1 << 17); \
- usiu.sipend |= (1 << 17); \
- \
- tm27IrqData.hdl = (rtems_irq_hdl)handler; \
- BSP_install_rtems_irq_handler (&tm27IrqData); \
-}
-
-#define Cause_tm27_intr() \
-{ \
- usiu.siel &= ~(1 << 17); \
-}
-
-#define Clear_tm27_intr() \
-{ \
- usiu.siel |= (1 << 17); \
- usiu.sipend |= (1 << 17); \
-}
-
-#define Lower_tm27_intr() \
-{ \
- ppc_cached_irq_mask |= (1 << 17); \
- usiu.simask = ppc_cached_irq_mask; \
-}
-
-#endif
diff --git a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h b/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
deleted file mode 100644
index 44e39608b1..0000000000
--- a/c/src/lib/libbsp/powerpc/ss555/irq/irq.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* irq.h
- *
- * This include file describe the data structure and the functions implemented
- * by rtems to write interrupt handlers.
- *
- *
- * SS555 port sponsored by Defence Research and Development Canada - Suffield
- * Copyright (C) 2004, Real-Time Systems Inc. (querbach@realtime.bc.ca)
- *
- * Derived from libbsp/powerpc/mbx8xx/irq/irq.h:
- *
- * CopyRight (C) 1999 valette@crf.canon.fr
- *
- * This code is heavilly inspired by the public specification of STREAM V2
- * that can be found at :
- *
- * <http://www.chorus.com/Documentation/index.html> by following
- * the STREAM API Specification Document link.
- *
- * 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_POWERPC_SS555_IRQ_IRQ_H
-#define LIBBSP_POWERPC_SS555_IRQ_IRQ_H
-
-#include <libcpu/irq.h>
-
-#ifndef ASM
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * These are no longer prototyped anywhere else. This appears to be
- * remnants of the IRQ code upgrade.
- *
- * --joel 28 April 2010
- */
-int CPU_install_rtems_irq_handler(const rtems_irq_connect_data* irq);
-int CPU_get_current_rtems_irq_handler(rtems_irq_connect_data* irq);
-int CPU_remove_rtems_irq_handler(const rtems_irq_connect_data* irq);
-int CPU_rtems_irq_mngt_set(rtems_irq_global_settings* config);
-int CPU_rtems_irq_mngt_get(rtems_irq_global_settings** config);
-void C_default_exception_handler(CPU_Exception_frame* excPtr);
-
-/*
- * The SS555 has no external interrupt controller chip, so use the standard
- * routines from the CPU-dependent code.
- */
-#define BSP_install_rtems_irq_handler(ptr) CPU_install_rtems_irq_handler(ptr)
-#define BSP_get_current_rtems_irq_handler(ptr) CPU_get_current_rtems_irq_handler(ptr)
-#define BSP_remove_rtems_irq_handler(ptr) CPU_remove_rtems_irq_handler(ptr)
-#define BSP_rtems_irq_mngt_set(config) CPU_rtems_irq_mngt_set(config)
-#define BSP_rtems_irq_mngt_get(config) CPU_rtems_irq_mngt_get(config)
-#define BSP_rtems_irq_mng_init(cpuId) CPU_rtems_irq_mng_init(cpuId)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ASM */
-
-#endif /* LIBBSP_POWERPC_SS555_IRQ_IRQ_H */
diff --git a/c/src/lib/libbsp/powerpc/ss555/preinstall.am b/c/src/lib/libbsp/powerpc/ss555/preinstall.am
deleted file mode 100644
index c051571ead..0000000000
--- a/c/src/lib/libbsp/powerpc/ss555/preinstall.am
+++ /dev/null
@@ -1,67 +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)/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/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-$(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
-
diff --git a/c/src/lib/libbsp/powerpc/ss555/bsp_specs b/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/ss555/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs