summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/genmcf548x
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/genmcf548x
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/genmcf548x')
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/Makefile.am23
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/configure.ac4
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h134
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/include/irq.h96
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h37
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/preinstall.am87
-rw-r--r--c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs (renamed from c/src/lib/libbsp/m68k/genmcf548x/bsp_specs)0
7 files changed, 8 insertions, 373 deletions
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 6259cedae5..fd9eac00f3 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -4,18 +4,7 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += include/irq.h
+dist_project_lib_DATA = startup/bsp_specs
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
@@ -26,16 +15,14 @@ start.$(OBJEXT): start/start.S
$(CPPASCOMPILE) -o $@ -c $<
project_lib_DATA = start.$(OBJEXT)
-dist_project_lib_DATA = bsp_specs
-dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
+project_lib_DATA += linkcmds
dist_project_lib_DATA += startup/linkcmds.COBRA5475
dist_project_lib_DATA += startup/linkcmds.m5484FireEngine
-
-project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
# startup
libbsp_a_SOURCES += \
@@ -82,5 +69,5 @@ if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/m68k/genmcf548x/headers.am
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
index ce1804c3d2..d7ec6702b9 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
+++ b/c/src/lib/libbsp/m68k/genmcf548x/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-m68k-genmcf548x],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/COBRA5475.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])
@@ -43,7 +46,6 @@ RTEMS_BSPOPTS_HELP([HAS_LOW_LEVEL_INIT],
[If defined, we will do all the low level init of the chip (like bus/memory...).])
RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h b/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
deleted file mode 100644
index 77a7bca0e8..0000000000
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/bsp.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * @file
- *
- * @ingroup m68k_genmcf548x
- *
- * @brief Global BSP definitions.
- */
-
-/*===============================================================*\
-| Project: RTEMS generic mcf548x BSP |
-+-----------------------------------------------------------------+
-| File: bsp.h |
-+-----------------------------------------------------------------+
-| The file contains the BSP header of generic MCF548x BSP. |
-+-----------------------------------------------------------------+
-| Copyright (c) 2007 |
-| Embedded Brains GmbH |
-| Obere Lagerstr. 30 |
-| D-82178 Puchheim |
-| Germany |
-| rtems@embedded-brains.de |
-+-----------------------------------------------------------------+
-| |
-| Parts of the code has been derived from the "dBUG source code" |
-| package Freescale is providing for M548X EVBs. The usage of |
-| the modified or unmodified code and it's integration into the |
-| generic mcf548x BSP has been done according to the Freescale |
-| license terms. |
-| |
-| The Freescale license terms can be reviewed in the file |
-| |
-| Freescale_license.txt |
-| |
-+-----------------------------------------------------------------+
-| |
-| The generic mcf548x BSP has been developed on the basic |
-| structures and modules of the av5282 BSP. |
-| |
-+-----------------------------------------------------------------+
-| |
-| 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. |
-| |
-+-----------------------------------------------------------------+
-| |
-| date history ID |
-| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
-| 12.11.07 1.0 ras |
-| |
-\*===============================================================*/
-
-#ifndef LIBBSP_M68K_GENMCF548X_BSP_H
-#define LIBBSP_M68K_GENMCF548X_BSP_H
-
-#include <bspopts.h>
-#include <bsp/default-initial-extension.h>
-
-/**
- * @defgroup m68k_genmcf548x MCF548X Support
- *
- * @ingroup bsp_m68k
- *
- * @brief MCT548X support.
- */
-
-#include <rtems.h>
-#include <rtems/bspIo.h>
-
-/***************************************************************************/
-/** Hardware data structure headers **/
-#include <mcf548x/mcf548x.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/***************************************************************************/
-/** User Definable configuration **/
-
-/* define which port the console should use - all other ports are then defined as general purpose */
-#define CONSOLE_PORT 0
-
-/* functions */
-
-uint32_t get_CPU_clock_speed(void);
-
-rtems_isr_entry set_vector(
- rtems_isr_entry handler,
- rtems_vector_number vector,
- int type
-);
-
-/* Initial values for the interrupt level and priority registers (INTC_ICRn) */
-extern const uint8_t mcf548x_intc_icr_init_values[64];
-
-/*
- * Network driver configuration
- */
-struct rtems_bsdnet_ifconfig;
-extern int rtems_mcf548x_fec_driver_attach_detach(struct rtems_bsdnet_ifconfig *config,int attaching);
-#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_mcf548x_fec_driver_attach_detach
-
-#define RTEMS_BSP_NETWORK_DRIVER_NAME "fec1"
-#define RTEMS_BSP_NETWORK_DRIVER_NAME2 "fec2"
-
-#ifdef HAS_DBUG
- typedef struct {
- uint32_t console_baudrate;
- uint8_t server_ip [4];
- uint8_t client_ip [4];
- uint8_t gateway_ip[4];
- uint8_t netmask [4];
- uint8_t spare[4];
- uint8_t macaddr [6];
- uint32_t ethport; /* default fec port: 1 = fec1, 2 = fec2 */
- uint32_t uartport; /* default fec port: 1 = psc0, 2 = psc1... */
- } dbug_settings_t;
-
-#define DBUG_SETTINGS (*(const dbug_settings_t *)0xFC020000)
-#endif /* HAS_DBUG */
-
-void bsp_cacr_set_flags(uint32_t flags);
-
-void bsp_cacr_set_self_clear_flags(uint32_t flags);
-
-void bsp_cacr_clear_flags(uint32_t flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h b/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h
deleted file mode 100644
index 825cc0d104..0000000000
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/irq.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * @file
- *
- * @ingroup genmcf548x_interrupt
- *
- * @brief Interrupt definitions.
- */
-
-/*
- * Copyright (c) 2013 embedded brains GmbH. All rights reserved.
- *
- * embedded brains GmbH
- * Dornierstr. 4
- * 82178 Puchheim
- * Germany
- * <rtems@embedded-brains.de>
- *
- * 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_M68K_MCF548X_IRQ_H
-#define LIBBSP_M68K_MCF548X_IRQ_H
-
-#include <rtems.h>
-#include <rtems/irq.h>
-#include <rtems/irq-extension.h>
-
-/**
- * @defgroup genmcf548x_interrupt Interrupt Support
- *
- * @ingroup m68k_genmcf548x
- *
- * @brief Interrupt support.
- */
-
-
-#define MCF548X_IRQ_EPORT_EPF1 1
-#define MCF548X_IRQ_EPORT_EPF2 2
-#define MCF548X_IRQ_EPORT_EPF3 3
-#define MCF548X_IRQ_EPORT_EPF4 4
-#define MCF548X_IRQ_EPORT_EPF5 5
-#define MCF548X_IRQ_EPORT_EPF6 6
-#define MCF548X_IRQ_EPORT_EPF7 7
-#define MCF548X_IRQ_USB_EP0ISR 15
-#define MCF548X_IRQ_USB_EP1ISR 16
-#define MCF548X_IRQ_USB_EP2ISR 17
-#define MCF548X_IRQ_USB_EP3ISR 18
-#define MCF548X_IRQ_USB_EP4ISR 19
-#define MCF548X_IRQ_USB_EP5ISR 20
-#define MCF548X_IRQ_USB_EP6ISR 21
-#define MCF548X_IRQ_USB_ISR 22
-#define MCF548X_IRQ_USB_AISR 23
-#define MCF548X_IRQ_DSPI_RFOF_TFUF 25
-#define MCF548X_IRQ_DSPI_RFOF 26
-#define MCF548X_IRQ_DSPI_RFDF 27
-#define MCF548X_IRQ_DSPI_TFUF 28
-#define MCF548X_IRQ_DSPI_TCF 29
-#define MCF548X_IRQ_DSPI_TFFF 30
-#define MCF548X_IRQ_DSPI_EOQF 31
-#define MCF548X_IRQ_DSPI 25
-#define MCF548X_IRQ_PSC3 32
-#define MCF548X_IRQ_PSC2 33
-#define MCF548X_IRQ_PSC1 34
-#define MCF548X_IRQ_PSC0 35
-#define MCF548X_IRQ_PSC(i) (35 - (i))
-#define MCF548X_IRQ_COMMTIM 36
-#define MCF548X_IRQ_SEC 37
-#define MCF548X_IRQ_FEC1 38
-#define MCF548X_IRQ_FEC0 39
-#define MCF548X_IRQ_FEC(i) (39 - (i))
-#define MCF548X_IRQ_I2C 40
-#define MCF548X_IRQ_PCIARB 41
-#define MCF548X_IRQ_CBPCI 42
-#define MCF548X_IRQ_XLBPCI 43
-#define MCF548X_IRQ_XLBARB 47
-#define MCF548X_IRQ_DMA 48
-#define MCF548X_IRQ_CAN0_ERROR 49
-#define MCF548X_IRQ_CAN0_BUSOFF 50
-#define MCF548X_IRQ_CAN0_MBOR 51
-#define MCF548X_IRQ_SLT1 53
-#define MCF548X_IRQ_SLT0 54
-#define MCF548X_IRQ_CAN1_ERROR 55
-#define MCF548X_IRQ_CAN1_BUSOFF 56
-#define MCF548X_IRQ_CAN1_MBOR 57
-#define MCF548X_IRQ_GPT3 59
-#define MCF548X_IRQ_GPT2 60
-#define MCF548X_IRQ_GPT1 61
-#define MCF548X_IRQ_GPT0 62
-
-#define BSP_INTERRUPT_VECTOR_MIN 1
-
-#define BSP_INTERRUPT_VECTOR_MAX 63
-
-#endif /* LIBBSP_M68K_MCF548X_IRQ_H */
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h b/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h
deleted file mode 100644
index 31ea8bca0c..0000000000
--- a/c/src/lib/libbsp/m68k/genmcf548x/include/tm27.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file
- *
- * @ingroup m68k_genmcf548x
- *
- * @brief Time Test 27 routines.
- */
-
-/*
- * 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
- * Don't bother with hardware -- just use a software-interrupt
- */
-
-#define MUST_WAIT_FOR_INTERRUPT 0
-
-#define Install_tm27_vector( handler ) set_vector( (handler), 35, 1 )
-
-#define Cause_tm27_intr() asm volatile ("trap #3");
-
-#define Clear_tm27_intr() /* empty */
-
-#define Lower_tm27_intr() /* empty */
-
-#endif
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am b/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
deleted file mode 100644
index 7308faf0d1..0000000000
--- a/c/src/lib/libbsp/m68k/genmcf548x/preinstall.am
+++ /dev/null
@@ -1,87 +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_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-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_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_LIB)/linkcmds.m5484FireEngine.flash: startup/linkcmds.m5484FireEngine.flash $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine.flash
-
-$(PROJECT_LIB)/linkcmds.COBRA5475: startup/linkcmds.COBRA5475 $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.COBRA5475
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.COBRA5475
-
-$(PROJECT_LIB)/linkcmds.m5484FireEngine: startup/linkcmds.m5484FireEngine $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.m5484FireEngine
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.m5484FireEngine
-
-$(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/bsp_specs
+++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs