summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mvme147s
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/m68k/mvme147s
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/m68k/mvme147s')
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/Makefile.am15
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/configure.ac3
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/include/bsp.h192
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/include/tm27.h38
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/preinstall.am72
-rw-r--r--c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/mvme147s/bsp_specs)0
6 files changed, 6 insertions, 314 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index 1e663ceeeb..c4d5f5f89d 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -4,29 +4,20 @@ 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
noinst_PROGRAMS =
## Zilog component header files
-include_rtems_zilogdir = $(includedir)/rtems/zilog
-include_rtems_zilog_HEADERS = ../../shared/include/zilog/z8530.h
EXTRA_DIST += ../../m68k/shared/start/start.S
start.$(OBJEXT): ../../m68k/shared/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 =
@@ -60,5 +51,5 @@ libbsp_a_LIBADD = \
EXTRA_DIST += times
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/mvme147s/headers.am
diff --git a/c/src/lib/libbsp/m68k/mvme147s/configure.ac b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
index 86dc3b4867..14f9a8bac5 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/configure.ac
+++ b/c/src/lib/libbsp/m68k/mvme147s/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-m68k-mvme147s],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/mvme147s.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/m68k/mvme147s/include/bsp.h b/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
deleted file mode 100644
index 3a4803fec2..0000000000
--- a/c/src/lib/libbsp/m68k/mvme147s/include/bsp.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* bsp.h
- *
- * This include file contains all MVME147 board IO definitions.
- *
- * COPYRIGHT (c) 1989-1999.
- * 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.
- *
- * MVME147 port for TNI - Telecom Bretagne
- * by Dominique LE CAMPION (Dominique.LECAMPION@enst-bretagne.fr)
- * May 1996
- */
-
-#ifndef LIBBSP_M68K_MVME147S_BSP_H
-#define LIBBSP_M68K_MVME147S_BSP_H
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-#include <rtems.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Constants */
-
-#define RAM_START 0x00007000
-#define RAM_END 0x003e0000
-#define DRAM_END 0x00400000
- /* We leave 128k for the shared memory */
-
- /* MVME 147 Peripheral controller chip
- see MVME147/D1, 3.4 */
-
-struct pcc_map {
- /* 32 bit registers */
- uint32_t dma_table_address; /* 0xfffe1000 */
- uint32_t dma_data_address; /* 0xfffe1004 */
- uint32_t dma_bytecount; /* 0xfffe1008 */
- uint32_t dma_data_holding; /* 0xfffe100c */
-
- /* 16 bit registers */
- uint16_t timer1_preload; /* 0xfffe1010 */
- uint16_t timer1_count; /* 0xfffe1012 */
- uint16_t timer2_preload; /* 0xfffe1014 */
- uint16_t timer2_count; /* 0xfffe1016 */
-
- /* 8 bit registers */
- uint8_t timer1_int_control; /* 0xfffe1018 */
- uint8_t timer1_control; /* 0xfffe1019 */
- uint8_t timer2_int_control; /* 0xfffe101a */
- uint8_t timer2_control; /* 0xfffe101b */
-
- uint8_t acfail_int_control; /* 0xfffe101c */
- uint8_t watchdog_control; /* 0xfffe101d */
-
- uint8_t printer_int_control; /* 0xfffe101e */
- uint8_t printer_control; /* 0xfffe102f */
-
- uint8_t dma_int_control; /* 0xfffe1020 */
- uint8_t dma_control; /* 0xfffe1021 */
- uint8_t bus_error_int_control; /* 0xfffe1022 */
- uint8_t dma_status; /* 0xfffe1023 */
- uint8_t abort_int_control; /* 0xfffe1024 */
- uint8_t table_address_function_code; /* 0xfffe1025 */
- uint8_t serial_port_int_control; /* 0xfffe1026 */
- uint8_t general_purpose_control; /* 0xfffe1027 */
- uint8_t lan_int_control; /* 0xfffe1028 */
- uint8_t general_purpose_status; /* 0xfffe1029 */
- uint8_t scsi_port_int_control; /* 0xfffe102a */
- uint8_t slave_base_address; /* 0xfffe102b */
- uint8_t software_int_1_control; /* 0xfffe102c */
- uint8_t int_base_vector; /* 0xfffe102d */
- uint8_t software_int_2_control; /* 0xfffe102e */
- uint8_t revision_level; /* 0xfffe102f */
-};
-
-#define pcc ((volatile struct pcc_map * const) 0xfffe1000)
-
-/* VME chip configuration registers */
-
-struct vme_lcsr_map {
- uint8_t unused_1;
- uint8_t system_controller; /* 0xfffe2001 */
- uint8_t unused_2;
- uint8_t vme_bus_requester; /* 0xfffe2003 */
- uint8_t unused_3;
- uint8_t master_configuration; /* 0xfffe2005 */
- uint8_t unused_4;
- uint8_t slave_configuration; /* 0xfffe2007 */
- uint8_t unused_5;
- uint8_t timer_configuration; /* 0xfffe2009 */
- uint8_t unused_6;
- uint8_t slave_address_modifier; /* 0xfffe200b */
- uint8_t unused_7;
- uint8_t master_address_modifier; /* 0xfffe200d */
- uint8_t unused_8;
- uint8_t interrupt_handler_mask; /* 0xfffe200f */
- uint8_t unused_9;
- uint8_t utility_interrupt_mask; /* 0xfffe2011 */
- uint8_t unused_10;
- uint8_t utility_interrupt_vector; /* 0xfffe2013 */
- uint8_t unused_11;
- uint8_t interrupt_request; /* 0xfffe2015 */
- uint8_t unused_12;
- uint8_t vme_bus_status_id; /* 0xfffe2017 */
- uint8_t unused_13;
- uint8_t bus_error_status; /* 0xfffe2019 */
- uint8_t unused_14;
- uint8_t gcsr_base_address; /* 0xfffe201b */
-};
-
-#define vme_lcsr ((volatile struct vme_lcsr_map * const) 0xfffe2000)
-
-struct vme_gcsr_map {
- uint8_t unused_1;
- uint8_t global_0; /* 0xfffe2021 */
- uint8_t unused_2;
- uint8_t global_1; /* 0xfffe2023 */
- uint8_t unused_3;
- uint8_t board_identification; /* 0xfffe2025 */
- uint8_t unused_4;
- uint8_t general_purpose_0; /* 0xfffe2027 */
- uint8_t unused_5;
- uint8_t general_purpose_1; /* 0xfffe2029 */
- uint8_t unused_6;
- uint8_t general_purpose_2; /* 0xfffe202b */
- uint8_t unused_7;
- uint8_t general_purpose_3; /* 0xfffe202d */
- uint8_t unused_8;
- uint8_t general_purpose_4; /* 0xfffe202f */
-};
-
-#define vme_gcsr ((volatile struct vme_gcsr_map * const) 0xfffe2020)
-
-#define z8530 0xfffe3001
-
-/* interrupt vectors - see MVME147/D1 4.14 */
-#define PCC_BASE_VECTOR 0x40 /* First user int */
-#define SCC_VECTOR PCC_BASE_VECTOR+3
-#define TIMER_1_VECTOR PCC_BASE_VECTOR+8
-#define TIMER_2_VECTOR PCC_BASE_VECTOR+9
-#define SOFT_1_VECTOR PCC_BASE_VECTOR+10
-#define SOFT_2_VECTOR PCC_BASE_VECTOR+11
-
-#define VME_BASE_VECTOR 0x50
-#define VME_SIGLP_VECTOR VME_BASE_VECTOR+1
-
-#define USE_CHANNEL_A 1 /* 1 = use channel A for console */
-#define USE_CHANNEL_B 0 /* 1 = use channel B for console */
-
-#if (USE_CHANNEL_A == 1)
-#define CONSOLE_CONTROL 0xfffe3002
-#define CONSOLE_DATA 0xfffe3003
-#elif (USE_CHANNEL_B == 1)
-#define CONSOLE_CONTROL 0xfffe3000
-#define CONSOLE_DATA 0xfffe3001
-#endif
-
-#define FOREVER 1 /* infinite loop */
-
-#ifdef M147_INIT
-#undef EXTERN
-#define EXTERN
-#else
-#undef EXTERN
-#define EXTERN extern
-#endif
-
-extern rtems_isr_entry M68Kvec[]; /* vector table address */
-
-/*
- * NOTE: Use the standard Clock driver entry
- */
-
-/* functions */
-
-rtems_isr_entry set_vector(
- rtems_isr_entry handler,
- rtems_vector_number vector,
- int type
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h b/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h
deleted file mode 100644
index 48ae0f459a..0000000000
--- a/c/src/lib/libbsp/m68k/mvme147s/include/tm27.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * @file
- * @ingroup m68k_mvme147s
- * @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
-
-/*
- * Define the interrupt mechanism for Time Test 27
- *
- * NOTE: Use the MPCSR vector for the MVME147
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) set_vector( (handler), \
- SOFT_1_VECTOR, 1 )
-
-#define Cause_tm27_intr() pcc->software_int_1_control = 0x0c
- /* generate level 4 sotware int. */
-
-#define Clear_tm27_intr() pcc->software_int_1_control = 0x00
-
-#define Lower_tm27_intr() /* empty */
-
-#endif
diff --git a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am b/c/src/lib/libbsp/m68k/mvme147s/preinstall.am
deleted file mode 100644
index a7c23bbc1b..0000000000
--- a/c/src/lib/libbsp/m68k/mvme147s/preinstall.am
+++ /dev/null
@@ -1,72 +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)/rtems/zilog/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/zilog
- @: > $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
-
-$(PROJECT_INCLUDE)/rtems/zilog/z8530.h: ../../shared/include/zilog/z8530.h $(PROJECT_INCLUDE)/rtems/zilog/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8530.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8530.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/m68k/mvme147s/bsp_specs b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs