summaryrefslogtreecommitdiffstats
path: root/bsps/sh
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 /bsps/sh
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 '')
-rw-r--r--bsps/sh/gensh1/headers.am17
-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/headers.am19
-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/headers.am19
-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/headers.am10
-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
32 files changed, 65 insertions, 0 deletions
diff --git a/bsps/sh/gensh1/headers.am b/bsps/sh/gensh1/headers.am
new file mode 100644
index 0000000000..5118d283ce
--- /dev/null
+++ b/bsps/sh/gensh1/headers.am
@@ -0,0 +1,17 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh1/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh1/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh1/include/rtems/score/iosh7032.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh1/include/rtems/score/ispsh7032.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sci.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sh7_pfc.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh1/include/sh/sh7_sci.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/bsps/sh/gensh2/headers.am b/bsps/sh/gensh2/headers.am
new file mode 100644
index 0000000000..7062397ddf
--- /dev/null
+++ b/bsps/sh/gensh2/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh2/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh2/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh2/include/rtems/score/iosh7045.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh2/include/rtems/score/ispsh7045.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/io_types.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sci.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sci_termios.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sh7_pfc.h
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh2/include/sh/sh7_sci.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/bsps/sh/gensh4/headers.am b/bsps/sh/gensh4/headers.am
new file mode 100644
index 0000000000..d3bb5ad26c
--- /dev/null
+++ b/bsps/sh/gensh4/headers.am
@@ -0,0 +1,19 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/sdram.h
+include_HEADERS += ../../../../../../bsps/sh/gensh4/include/tm27.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS =
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/iosh7750.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/ipl.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/ispsh7750.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/sh4_regs.h
+include_rtems_score_HEADERS += ../../../../../../bsps/sh/gensh4/include/rtems/score/sh7750_regs.h
+
+include_shdir = $(includedir)/sh
+include_sh_HEADERS =
+include_sh_HEADERS += ../../../../../../bsps/sh/gensh4/include/sh/sh4uart.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/bsps/sh/shsim/headers.am b/bsps/sh/shsim/headers.am
new file mode 100644
index 0000000000..d221f41a07
--- /dev/null
+++ b/bsps/sh/shsim/headers.am
@@ -0,0 +1,10 @@
+## This file was generated by "./boostrap -H".
+
+include_HEADERS =
+include_HEADERS += ../../../../../../bsps/sh/shsim/include/bsp.h
+include_HEADERS += include/bspopts.h
+include_HEADERS += ../../../../../../bsps/sh/shsim/include/tm27.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/sh/shsim/include/bsp/syscall.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