diff options
author | Chris Johns <chrisj@rtems.org> | 2017-12-23 18:18:56 +1100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-25 08:45:26 +0100 |
commit | 2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch) | |
tree | 44759efe9374f13200a97e96d91bd9a2b7e5ce2a /c/src/lib/libbsp/sh | |
parent | MAINTAINERS: Add myself to Write After Approval. (diff) | |
download | rtems-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 '')
-rw-r--r-- | bsps/include/bsp/VME.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/VME.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/VMEDMA.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/bootcard.h (renamed from c/src/lib/libbsp/shared/include/bootcard.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/bspVmeDmaList.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/console-polled.h (renamed from c/src/lib/libbsp/shared/include/console-polled.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/console-termios.h (renamed from c/src/lib/libbsp/shared/include/console-termios.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/default-initial-extension.h (renamed from c/src/lib/libbsp/shared/include/default-initial-extension.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/fatal.h (renamed from c/src/lib/libbsp/shared/include/fatal.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/fdt.h (renamed from c/src/lib/libbsp/shared/include/fdt.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/gpio.h (renamed from c/src/lib/libbsp/shared/include/gpio.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/irq-generic.h (renamed from c/src/lib/libbsp/shared/include/irq-generic.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/irq-info.h (renamed from c/src/lib/libbsp/shared/include/irq-info.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/mm.h (renamed from c/src/lib/libbsp/shared/include/mm.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/stackalloc.h (renamed from c/src/lib/libbsp/shared/include/stackalloc.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/u-boot.h (renamed from c/src/lib/libbsp/shared/include/u-boot.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/uart-output-char.h (renamed from c/src/lib/libbsp/shared/include/uart-output-char.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/utility.h (renamed from c/src/lib/libbsp/shared/include/utility.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/vmeTsi148.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/vmeTsi148DMA.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/vmeUniverse.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/vmeUniverseDMA.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h) | 0 | ||||
-rw-r--r-- | bsps/include/bsp/vme_am_defs.h (renamed from c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h) | 0 | ||||
-rw-r--r-- | bsps/include/rtems/umon.h (renamed from c/src/lib/libbsp/shared/umon/umon.h) | 0 | ||||
-rw-r--r-- | bsps/include/rtems/zilog/z8036.h (renamed from c/src/lib/libbsp/shared/include/zilog/z8036.h) | 0 | ||||
-rw-r--r-- | bsps/include/rtems/zilog/z8530.h (renamed from c/src/lib/libbsp/shared/include/zilog/z8530.h) | 0 | ||||
-rw-r--r-- | bsps/include/umon/cli.h (renamed from c/src/lib/libbsp/shared/umon/cli.h) | 0 | ||||
-rw-r--r-- | bsps/include/umon/monlib.h (renamed from c/src/lib/libbsp/shared/umon/monlib.h) | 0 | ||||
-rw-r--r-- | bsps/include/umon/tfs.h (renamed from c/src/lib/libbsp/shared/umon/tfs.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/bsp.h (renamed from c/src/lib/libbsp/sh/gensh1/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/rtems/score/iosh7032.h (renamed from c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/rtems/score/ispsh7032.h (renamed from c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/sh/sci.h (renamed from c/src/lib/libbsp/sh/gensh1/include/sh/sci.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/sh/sh7_pfc.h (renamed from c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/sh/sh7_sci.h (renamed from c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh1/include/tm27.h (renamed from c/src/lib/libbsp/sh/gensh1/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/bsp.h (renamed from c/src/lib/libbsp/sh/gensh2/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/rtems/score/iosh7045.h (renamed from c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/rtems/score/ispsh7045.h (renamed from c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/sh/io_types.h (renamed from c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/sh/sci.h (renamed from c/src/lib/libbsp/sh/gensh2/include/sh/sci.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/sh/sci_termios.h (renamed from c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/sh/sh7_pfc.h (renamed from c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/sh/sh7_sci.h (renamed from c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh2/include/tm27.h (renamed from c/src/lib/libbsp/sh/gensh2/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/bsp.h (renamed from c/src/lib/libbsp/sh/gensh4/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/rtems/score/iosh7750.h (renamed from c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/rtems/score/ipl.h (renamed from c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/rtems/score/ispsh7750.h (renamed from c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/rtems/score/sh4_regs.h (renamed from c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/rtems/score/sh7750_regs.h (renamed from c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/sdram.h (renamed from c/src/lib/libbsp/sh/gensh4/include/sdram.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/sh/sh4uart.h (renamed from c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h) | 0 | ||||
-rw-r--r-- | bsps/sh/gensh4/include/tm27.h (renamed from c/src/lib/libbsp/sh/gensh4/include/tm27.h) | 0 | ||||
-rw-r--r-- | bsps/sh/shsim/include/bsp.h (renamed from c/src/lib/libbsp/sh/shsim/include/bsp.h) | 0 | ||||
-rw-r--r-- | bsps/sh/shsim/include/bsp/syscall.h (renamed from c/src/lib/libbsp/sh/shsim/include/syscall.h) | 0 | ||||
-rw-r--r-- | bsps/sh/shsim/include/tm27.h (renamed from c/src/lib/libbsp/sh/shsim/include/tm27.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/Makefile.am | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/preinstall.am | 93 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh1/startup/bsp_specs (renamed from c/src/lib/libbsp/sh/gensh1/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/Makefile.am | 27 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/preinstall.am | 109 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/startup/bsp_specs (renamed from c/src/lib/libbsp/sh/gensh2/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/Makefile.am | 28 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/preinstall.am | 109 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/bsp_specs (renamed from c/src/lib/libbsp/sh/gensh4/bsp_specs) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/Makefile.am | 15 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/configure.ac | 3 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/preinstall.am | 71 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/shsim/startup/bsp_specs (renamed from c/src/lib/libbsp/sh/shsim/bsp_specs) | 0 |
73 files changed, 30 insertions, 458 deletions
diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VME.h b/bsps/include/bsp/VME.h index bdaa45870e..bdaa45870e 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/VME.h +++ b/bsps/include/bsp/VME.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h b/bsps/include/bsp/VMEDMA.h index 636f6d365c..636f6d365c 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/VMEDMA.h +++ b/bsps/include/bsp/VMEDMA.h diff --git a/c/src/lib/libbsp/shared/include/bootcard.h b/bsps/include/bsp/bootcard.h index aaac42e8e2..aaac42e8e2 100644 --- a/c/src/lib/libbsp/shared/include/bootcard.h +++ b/bsps/include/bsp/bootcard.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h b/bsps/include/bsp/bspVmeDmaList.h index 414afab5c9..414afab5c9 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/bspVmeDmaList.h +++ b/bsps/include/bsp/bspVmeDmaList.h diff --git a/c/src/lib/libbsp/shared/include/console-polled.h b/bsps/include/bsp/console-polled.h index 09a99c30cb..09a99c30cb 100644 --- a/c/src/lib/libbsp/shared/include/console-polled.h +++ b/bsps/include/bsp/console-polled.h diff --git a/c/src/lib/libbsp/shared/include/console-termios.h b/bsps/include/bsp/console-termios.h index 413dde4663..413dde4663 100644 --- a/c/src/lib/libbsp/shared/include/console-termios.h +++ b/bsps/include/bsp/console-termios.h diff --git a/c/src/lib/libbsp/shared/include/default-initial-extension.h b/bsps/include/bsp/default-initial-extension.h index 1c795b7278..1c795b7278 100644 --- a/c/src/lib/libbsp/shared/include/default-initial-extension.h +++ b/bsps/include/bsp/default-initial-extension.h diff --git a/c/src/lib/libbsp/shared/include/fatal.h b/bsps/include/bsp/fatal.h index ca2e39aba8..ca2e39aba8 100644 --- a/c/src/lib/libbsp/shared/include/fatal.h +++ b/bsps/include/bsp/fatal.h diff --git a/c/src/lib/libbsp/shared/include/fdt.h b/bsps/include/bsp/fdt.h index 4ed05b136c..4ed05b136c 100644 --- a/c/src/lib/libbsp/shared/include/fdt.h +++ b/bsps/include/bsp/fdt.h diff --git a/c/src/lib/libbsp/shared/include/gpio.h b/bsps/include/bsp/gpio.h index 64a877ae7a..64a877ae7a 100644 --- a/c/src/lib/libbsp/shared/include/gpio.h +++ b/bsps/include/bsp/gpio.h diff --git a/c/src/lib/libbsp/shared/include/irq-generic.h b/bsps/include/bsp/irq-generic.h index 187aea84d1..187aea84d1 100644 --- a/c/src/lib/libbsp/shared/include/irq-generic.h +++ b/bsps/include/bsp/irq-generic.h diff --git a/c/src/lib/libbsp/shared/include/irq-info.h b/bsps/include/bsp/irq-info.h index ea6d629e76..ea6d629e76 100644 --- a/c/src/lib/libbsp/shared/include/irq-info.h +++ b/bsps/include/bsp/irq-info.h diff --git a/c/src/lib/libbsp/shared/include/mm.h b/bsps/include/bsp/mm.h index 2152f686ba..2152f686ba 100644 --- a/c/src/lib/libbsp/shared/include/mm.h +++ b/bsps/include/bsp/mm.h diff --git a/c/src/lib/libbsp/shared/include/stackalloc.h b/bsps/include/bsp/stackalloc.h index 89414c8e6e..89414c8e6e 100644 --- a/c/src/lib/libbsp/shared/include/stackalloc.h +++ b/bsps/include/bsp/stackalloc.h diff --git a/c/src/lib/libbsp/shared/include/u-boot.h b/bsps/include/bsp/u-boot.h index 866cd9bbb0..866cd9bbb0 100644 --- a/c/src/lib/libbsp/shared/include/u-boot.h +++ b/bsps/include/bsp/u-boot.h diff --git a/c/src/lib/libbsp/shared/include/uart-output-char.h b/bsps/include/bsp/uart-output-char.h index a6648d1ad4..a6648d1ad4 100644 --- a/c/src/lib/libbsp/shared/include/uart-output-char.h +++ b/bsps/include/bsp/uart-output-char.h diff --git a/c/src/lib/libbsp/shared/include/utility.h b/bsps/include/bsp/utility.h index fee28f445a..fee28f445a 100644 --- a/c/src/lib/libbsp/shared/include/utility.h +++ b/bsps/include/bsp/utility.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h b/bsps/include/bsp/vmeTsi148.h index 6183940a2d..6183940a2d 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.h +++ b/bsps/include/bsp/vmeTsi148.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h b/bsps/include/bsp/vmeTsi148DMA.h index da7c99302b..da7c99302b 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148DMA.h +++ b/bsps/include/bsp/vmeTsi148DMA.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h b/bsps/include/bsp/vmeUniverse.h index 7cb9f8d2de..7cb9f8d2de 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverse.h +++ b/bsps/include/bsp/vmeUniverse.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h b/bsps/include/bsp/vmeUniverseDMA.h index d0a3d6f0e7..d0a3d6f0e7 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeUniverseDMA.h +++ b/bsps/include/bsp/vmeUniverseDMA.h diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h b/bsps/include/bsp/vme_am_defs.h index efa28b3aa0..efa28b3aa0 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vme_am_defs.h +++ b/bsps/include/bsp/vme_am_defs.h diff --git a/c/src/lib/libbsp/shared/umon/umon.h b/bsps/include/rtems/umon.h index d25a7818dd..d25a7818dd 100644 --- a/c/src/lib/libbsp/shared/umon/umon.h +++ b/bsps/include/rtems/umon.h diff --git a/c/src/lib/libbsp/shared/include/zilog/z8036.h b/bsps/include/rtems/zilog/z8036.h index fea1493905..fea1493905 100644 --- a/c/src/lib/libbsp/shared/include/zilog/z8036.h +++ b/bsps/include/rtems/zilog/z8036.h diff --git a/c/src/lib/libbsp/shared/include/zilog/z8530.h b/bsps/include/rtems/zilog/z8530.h index 161b9a022c..161b9a022c 100644 --- a/c/src/lib/libbsp/shared/include/zilog/z8530.h +++ b/bsps/include/rtems/zilog/z8530.h diff --git a/c/src/lib/libbsp/shared/umon/cli.h b/bsps/include/umon/cli.h index 0e1689db26..0e1689db26 100644 --- a/c/src/lib/libbsp/shared/umon/cli.h +++ b/bsps/include/umon/cli.h diff --git a/c/src/lib/libbsp/shared/umon/monlib.h b/bsps/include/umon/monlib.h index efbfc93d59..efbfc93d59 100644 --- a/c/src/lib/libbsp/shared/umon/monlib.h +++ b/bsps/include/umon/monlib.h diff --git a/c/src/lib/libbsp/shared/umon/tfs.h b/bsps/include/umon/tfs.h index 258288bd14..258288bd14 100644 --- a/c/src/lib/libbsp/shared/umon/tfs.h +++ b/bsps/include/umon/tfs.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/bsps/sh/gensh1/include/bsp.h index 2c0da4b074..2c0da4b074 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/bsps/sh/gensh1/include/bsp.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h b/bsps/sh/gensh1/include/rtems/score/iosh7032.h index 3750024a64..3750024a64 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/iosh7032.h +++ b/bsps/sh/gensh1/include/rtems/score/iosh7032.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h b/bsps/sh/gensh1/include/rtems/score/ispsh7032.h index 9c7cee8bd6..9c7cee8bd6 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/rtems/score/ispsh7032.h +++ b/bsps/sh/gensh1/include/rtems/score/ispsh7032.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sci.h b/bsps/sh/gensh1/include/sh/sci.h index 5653afca3c..5653afca3c 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/sh/sci.h +++ b/bsps/sh/gensh1/include/sh/sci.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h b/bsps/sh/gensh1/include/sh/sh7_pfc.h index 1045af6af8..1045af6af8 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_pfc.h +++ b/bsps/sh/gensh1/include/sh/sh7_pfc.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h b/bsps/sh/gensh1/include/sh/sh7_sci.h index 0b80a485d3..0b80a485d3 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/sh/sh7_sci.h +++ b/bsps/sh/gensh1/include/sh/sh7_sci.h diff --git a/c/src/lib/libbsp/sh/gensh1/include/tm27.h b/bsps/sh/gensh1/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/tm27.h +++ b/bsps/sh/gensh1/include/tm27.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/bsps/sh/gensh2/include/bsp.h index 221137ad81..221137ad81 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h +++ b/bsps/sh/gensh2/include/bsp.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h b/bsps/sh/gensh2/include/rtems/score/iosh7045.h index db3252b72d..db3252b72d 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h +++ b/bsps/sh/gensh2/include/rtems/score/iosh7045.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h b/bsps/sh/gensh2/include/rtems/score/ispsh7045.h index fb9f5297ae..fb9f5297ae 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h +++ b/bsps/sh/gensh2/include/rtems/score/ispsh7045.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h b/bsps/sh/gensh2/include/sh/io_types.h index 1dab885672..1dab885672 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h +++ b/bsps/sh/gensh2/include/sh/io_types.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h b/bsps/sh/gensh2/include/sh/sci.h index dc34371d48..dc34371d48 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h +++ b/bsps/sh/gensh2/include/sh/sci.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h b/bsps/sh/gensh2/include/sh/sci_termios.h index 63750c9461..63750c9461 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h +++ b/bsps/sh/gensh2/include/sh/sci_termios.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h b/bsps/sh/gensh2/include/sh/sh7_pfc.h index b56433a9e2..b56433a9e2 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h +++ b/bsps/sh/gensh2/include/sh/sh7_pfc.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h b/bsps/sh/gensh2/include/sh/sh7_sci.h index 7218313704..7218313704 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h +++ b/bsps/sh/gensh2/include/sh/sh7_sci.h diff --git a/c/src/lib/libbsp/sh/gensh2/include/tm27.h b/bsps/sh/gensh2/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/tm27.h +++ b/bsps/sh/gensh2/include/tm27.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/bsps/sh/gensh4/include/bsp.h index b70c2ffdac..b70c2ffdac 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h +++ b/bsps/sh/gensh4/include/bsp.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h b/bsps/sh/gensh4/include/rtems/score/iosh7750.h index c5c532dbc2..c5c532dbc2 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/iosh7750.h +++ b/bsps/sh/gensh4/include/rtems/score/iosh7750.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h b/bsps/sh/gensh4/include/rtems/score/ipl.h index 9ce2d87e0e..9ce2d87e0e 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ipl.h +++ b/bsps/sh/gensh4/include/rtems/score/ipl.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h b/bsps/sh/gensh4/include/rtems/score/ispsh7750.h index 396644a241..396644a241 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/ispsh7750.h +++ b/bsps/sh/gensh4/include/rtems/score/ispsh7750.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h b/bsps/sh/gensh4/include/rtems/score/sh4_regs.h index 074dc6d7a1..074dc6d7a1 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh4_regs.h +++ b/bsps/sh/gensh4/include/rtems/score/sh4_regs.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h b/bsps/sh/gensh4/include/rtems/score/sh7750_regs.h index b65f9b6e51..b65f9b6e51 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/rtems/score/sh7750_regs.h +++ b/bsps/sh/gensh4/include/rtems/score/sh7750_regs.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/sdram.h b/bsps/sh/gensh4/include/sdram.h index 52acaa61db..52acaa61db 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/sdram.h +++ b/bsps/sh/gensh4/include/sdram.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h b/bsps/sh/gensh4/include/sh/sh4uart.h index 1e7a486eb8..1e7a486eb8 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/sh/sh4uart.h +++ b/bsps/sh/gensh4/include/sh/sh4uart.h diff --git a/c/src/lib/libbsp/sh/gensh4/include/tm27.h b/bsps/sh/gensh4/include/tm27.h index c26ec49272..c26ec49272 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/tm27.h +++ b/bsps/sh/gensh4/include/tm27.h diff --git a/c/src/lib/libbsp/sh/shsim/include/bsp.h b/bsps/sh/shsim/include/bsp.h index 7b8236b09a..7b8236b09a 100644 --- a/c/src/lib/libbsp/sh/shsim/include/bsp.h +++ b/bsps/sh/shsim/include/bsp.h diff --git a/c/src/lib/libbsp/sh/shsim/include/syscall.h b/bsps/sh/shsim/include/bsp/syscall.h index e5cde7217b..e5cde7217b 100644 --- a/c/src/lib/libbsp/sh/shsim/include/syscall.h +++ b/bsps/sh/shsim/include/bsp/syscall.h diff --git a/c/src/lib/libbsp/sh/shsim/include/tm27.h b/bsps/sh/shsim/include/tm27.h index 0dfa7bf628..0dfa7bf628 100644 --- a/c/src/lib/libbsp/sh/shsim/include/tm27.h +++ b/bsps/sh/shsim/include/tm27.h diff --git a/c/src/lib/libbsp/sh/configure.ac b/c/src/lib/libbsp/sh/configure.ac index e54378682b..79df52f9a9 100644 --- a/c/src/lib/libbsp/sh/configure.ac +++ b/c/src/lib/libbsp/sh/configure.ac @@ -4,6 +4,8 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([gensh1]) RTEMS_TOP(../../../../..) +RTEMS_SOURCE_TOP +RTEMS_BUILD_TOP RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE([no-define foreign 1.12.2]) diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 50bf67569e..f2e2993f18 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -4,24 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score -include_bspdir = $(includedir)/bsp +dist_project_lib_DATA = startup/bsp_specs -dist_project_lib_DATA = bsp_specs - -include_sh_HEADERS = include/sh/sci.h -include_sh_HEADERS += include/sh/sh7_pfc.h -include_sh_HEADERS += include/sh/sh7_sci.h - -include_rtems_score_HEADERS = include/rtems/score/ispsh7032.h -include_rtems_score_HEADERS += include/rtems/score/iosh7032.h - -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 @@ -30,7 +14,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 = @@ -69,5 +53,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sh/gensh1/headers.am diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index 6d49847588..71f2c2c28b 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-gensh1],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gensh1.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/sh/gensh1/preinstall.am b/c/src/lib/libbsp/sh/gensh1/preinstall.am deleted file mode 100644 index 8132cc2d64..0000000000 --- a/c/src/lib/libbsp/sh/gensh1/preinstall.am +++ /dev/null @@ -1,93 +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)/sh/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/sh - @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score - @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(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)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h - -$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h - -$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h - -$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: include/rtems/score/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h - -$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/rtems/score/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h - -$(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_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/sh/gensh1/bsp_specs b/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sh/gensh1/bsp_specs +++ b/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 57f0ab7b3b..131ee3f58c 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -4,26 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score -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_sh_HEADERS = include/sh/io_types.h -include_sh_HEADERS += include/sh/sci.h -include_sh_HEADERS += include/sh/sh7_pfc.h -include_sh_HEADERS += include/sh/sh7_sci.h -include_sh_HEADERS += include/sh/sci_termios.h - -include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h -include_rtems_score_HEADERS += include/rtems/score/iosh7045.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -33,8 +15,9 @@ start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/linkcmds.ram \ - startup/linkcmds.rom +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds.ram +dist_project_lib_DATA += startup/linkcmds.rom noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -72,5 +55,5 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += ../../shared/include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sh/gensh2/headers.am diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac index 4fdd7e5717..2d6f3492fa 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.ac +++ b/c/src/lib/libbsp/sh/gensh2/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-gensh2],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gensh2.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/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am deleted file mode 100644 index 742998fee3..0000000000 --- a/c/src/lib/libbsp/sh/gensh2/preinstall.am +++ /dev/null @@ -1,109 +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)/sh/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/sh - @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score - @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(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)/sh/io_types.h: include/sh/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h - -$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h - -$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h - -$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h - -$(PROJECT_INCLUDE)/sh/sci_termios.h: include/sh/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h - -$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: include/rtems/score/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h - -$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/rtems/score/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.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_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 - -$(PROJECT_LIB)/linkcmds.ram: startup/linkcmds.ram $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.ram -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.ram - -$(PROJECT_LIB)/linkcmds.rom: startup/linkcmds.rom $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom - diff --git a/c/src/lib/libbsp/sh/gensh2/bsp_specs b/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sh/gensh2/bsp_specs +++ b/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index f31be5acb3..42539aa8cc 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -4,36 +4,18 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score -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_sh_HEADERS = include/sh/sh4uart.h - -include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h -include_rtems_score_HEADERS += include/rtems/score/ipl.h -include_rtems_score_HEADERS += include/rtems/score/iosh7750.h -include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h -include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h - -nodist_include_HEADERS = include/bspopts.h -nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h -include_HEADERS += include/sdram.h - EXTRA_DIST += start/start.S start.$(OBJEXT): start/start.S $(CPPASCOMPILE) -o $@ -c $< project_lib_DATA = start.$(OBJEXT) -dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \ - startup/linkcmds.rom2ram +project_lib_DATA += linkcmds +dist_project_lib_DATA += startup/linkcmds.rom +dist_project_lib_DATA += startup/linkcmds.rom2ram noinst_LIBRARIES = libbsp.a libbsp_a_SOURCES = @@ -62,5 +44,5 @@ libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include EXTRA_DIST += times -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sh/gensh4/headers.am diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac index 002f8ff75c..461a054033 100644 --- a/c/src/lib/libbsp/sh/gensh4/configure.ac +++ b/c/src/lib/libbsp/sh/gensh4/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-gensh4],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/gensh4.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/sh/gensh4/preinstall.am b/c/src/lib/libbsp/sh/gensh4/preinstall.am deleted file mode 100644 index 70723c34fe..0000000000 --- a/c/src/lib/libbsp/sh/gensh4/preinstall.am +++ /dev/null @@ -1,109 +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)/sh/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/sh - @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score - @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(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)/sh/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h - -$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h - -$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h - -$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h - -$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h - -$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.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)/sdram.h: include/sdram.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sdram.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sdram.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 - -$(PROJECT_LIB)/linkcmds.rom: startup/linkcmds.rom $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom - -$(PROJECT_LIB)/linkcmds.rom2ram: startup/linkcmds.rom2ram $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.rom2ram -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.rom2ram - diff --git a/c/src/lib/libbsp/sh/gensh4/bsp_specs b/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sh/gensh4/bsp_specs +++ b/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 98839139fe..9cd43bac4a 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -4,17 +4,8 @@ EXTRA_DIST = include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../bsp.am -include_bspdir = $(includedir)/bsp -include_bsp_HEADERS = include/syscall.h +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 -nodist_include_bsp_HEADERS += ../../shared/include/console-polled.h DISTCLEANFILES = include/bspopts.h @@ -23,7 +14,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 = @@ -60,5 +51,5 @@ libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c libbsp_a_SOURCES += ../../shared/include/cache_.h libbsp_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../shared/include -include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am +include $(srcdir)/../../../../../../bsps/sh/shsim/headers.am diff --git a/c/src/lib/libbsp/sh/shsim/configure.ac b/c/src/lib/libbsp/sh/shsim/configure.ac index 25fa949461..a1d3a95b7b 100644 --- a/c/src/lib/libbsp/sh/shsim/configure.ac +++ b/c/src/lib/libbsp/sh/shsim/configure.ac @@ -4,6 +4,9 @@ AC_PREREQ([2.69]) AC_INIT([rtems-c-src-lib-libbsp-sh-shsim],[_RTEMS_VERSION],[https://devel.rtems.org/newticket]) AC_CONFIG_SRCDIR([make/custom/simsh1.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/sh/shsim/preinstall.am b/c/src/lib/libbsp/sh/shsim/preinstall.am deleted file mode 100644 index 738a41badc..0000000000 --- a/c/src/lib/libbsp/sh/shsim/preinstall.am +++ /dev/null @@ -1,71 +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/syscall.h: include/syscall.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/syscall.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/syscall.h - -$(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/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/sh/shsim/bsp_specs b/c/src/lib/libbsp/sh/shsim/startup/bsp_specs index 87638cc027..87638cc027 100644 --- a/c/src/lib/libbsp/sh/shsim/bsp_specs +++ b/c/src/lib/libbsp/sh/shsim/startup/bsp_specs |