summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/lm32
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/lm32
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/lm32/include/bsp/irq.h (renamed from c/src/lib/libbsp/lm32/shared/include/irq.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_ac97.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_buttons.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_dmx.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_flash.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_gpio.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_ir.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_memcard.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_midi.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_pfpu.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_tmu.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_usbinput.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_versions.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h)0
-rw-r--r--bsps/lm32/include/bsp/milkymist_video.h (renamed from c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h)0
-rw-r--r--bsps/lm32/lm32_evr/include/bsp.h (renamed from c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h)0
-rw-r--r--bsps/lm32/lm32_evr/include/system_conf.h (renamed from c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h)0
-rw-r--r--bsps/lm32/lm32_evr/include/tm27.h (renamed from c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h)0
-rw-r--r--bsps/lm32/milkymist/include/bsp.h (renamed from c/src/lib/libbsp/lm32/milkymist/include/bsp.h)0
-rw-r--r--bsps/lm32/milkymist/include/system_conf.h (renamed from c/src/lib/libbsp/lm32/milkymist/include/system_conf.h)0
-rw-r--r--bsps/lm32/milkymist/include/tm27.h (renamed from c/src/lib/libbsp/lm32/milkymist/include/tm27.h)0
-rw-r--r--c/src/lib/libbsp/lm32/Makefile.am1
-rw-r--r--c/src/lib/libbsp/lm32/configure.ac2
-rw-r--r--c/src/lib/libbsp/lm32/lm32_evr/Makefile.am14
-rw-r--r--c/src/lib/libbsp/lm32/lm32_evr/configure.ac3
-rw-r--r--c/src/lib/libbsp/lm32/lm32_evr/preinstall.am67
-rw-r--r--c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs (renamed from c/src/lib/libbsp/lm32/lm32_evr/bsp_specs)0
-rw-r--r--c/src/lib/libbsp/lm32/milkymist/Makefile.am32
-rw-r--r--c/src/lib/libbsp/lm32/milkymist/configure.ac3
-rw-r--r--c/src/lib/libbsp/lm32/milkymist/preinstall.am127
-rw-r--r--c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs (renamed from c/src/lib/libbsp/lm32/milkymist/bsp_specs)0
30 files changed, 16 insertions, 233 deletions
diff --git a/c/src/lib/libbsp/lm32/shared/include/irq.h b/bsps/lm32/include/bsp/irq.h
index b1ccd66339..b1ccd66339 100644
--- a/c/src/lib/libbsp/lm32/shared/include/irq.h
+++ b/bsps/lm32/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h b/bsps/lm32/include/bsp/milkymist_ac97.h
index 37415a1f5e..37415a1f5e 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_ac97/milkymist_ac97.h
+++ b/bsps/lm32/include/bsp/milkymist_ac97.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h b/bsps/lm32/include/bsp/milkymist_buttons.h
index de6ee51438..de6ee51438 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_buttons/milkymist_buttons.h
+++ b/bsps/lm32/include/bsp/milkymist_buttons.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h b/bsps/lm32/include/bsp/milkymist_dmx.h
index a933e3423f..a933e3423f 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_dmx/milkymist_dmx.h
+++ b/bsps/lm32/include/bsp/milkymist_dmx.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h b/bsps/lm32/include/bsp/milkymist_flash.h
index 2acf855096..2acf855096 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_flash/milkymist_flash.h
+++ b/bsps/lm32/include/bsp/milkymist_flash.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h b/bsps/lm32/include/bsp/milkymist_gpio.h
index 1e30b9c280..1e30b9c280 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_gpio/milkymist_gpio.h
+++ b/bsps/lm32/include/bsp/milkymist_gpio.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h b/bsps/lm32/include/bsp/milkymist_ir.h
index 4df7f3550c..4df7f3550c 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_ir/milkymist_ir.h
+++ b/bsps/lm32/include/bsp/milkymist_ir.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h b/bsps/lm32/include/bsp/milkymist_memcard.h
index 713b45be07..713b45be07 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_memcard/milkymist_memcard.h
+++ b/bsps/lm32/include/bsp/milkymist_memcard.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h b/bsps/lm32/include/bsp/milkymist_midi.h
index da53de6af5..da53de6af5 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_midi/milkymist_midi.h
+++ b/bsps/lm32/include/bsp/milkymist_midi.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h b/bsps/lm32/include/bsp/milkymist_pfpu.h
index 73ea5fa28e..73ea5fa28e 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_pfpu/milkymist_pfpu.h
+++ b/bsps/lm32/include/bsp/milkymist_pfpu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h b/bsps/lm32/include/bsp/milkymist_tmu.h
index 94f8394ef7..94f8394ef7 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_tmu/milkymist_tmu.h
+++ b/bsps/lm32/include/bsp/milkymist_tmu.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h b/bsps/lm32/include/bsp/milkymist_usbinput.h
index 04c376fa8a..04c376fa8a 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/milkymist_usbinput.h
+++ b/bsps/lm32/include/bsp/milkymist_usbinput.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h b/bsps/lm32/include/bsp/milkymist_versions.h
index 3b5063f306..3b5063f306 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_versions/milkymist_versions.h
+++ b/bsps/lm32/include/bsp/milkymist_versions.h
diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h b/bsps/lm32/include/bsp/milkymist_video.h
index 6ec3cc0a83..6ec3cc0a83 100644
--- a/c/src/lib/libbsp/lm32/shared/milkymist_video/milkymist_video.h
+++ b/bsps/lm32/include/bsp/milkymist_video.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h b/bsps/lm32/lm32_evr/include/bsp.h
index 7c3ac8400d..7c3ac8400d 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/bsp.h
+++ b/bsps/lm32/lm32_evr/include/bsp.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h b/bsps/lm32/lm32_evr/include/system_conf.h
index 41f17e2be0..41f17e2be0 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/system_conf.h
+++ b/bsps/lm32/lm32_evr/include/system_conf.h
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h b/bsps/lm32/lm32_evr/include/tm27.h
index f62e62e73f..f62e62e73f 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/include/tm27.h
+++ b/bsps/lm32/lm32_evr/include/tm27.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h b/bsps/lm32/milkymist/include/bsp.h
index d8af4a3124..d8af4a3124 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/bsp.h
+++ b/bsps/lm32/milkymist/include/bsp.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h b/bsps/lm32/milkymist/include/system_conf.h
index 8ba4a1cf43..8ba4a1cf43 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/system_conf.h
+++ b/bsps/lm32/milkymist/include/system_conf.h
diff --git a/c/src/lib/libbsp/lm32/milkymist/include/tm27.h b/bsps/lm32/milkymist/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/lm32/milkymist/include/tm27.h
+++ b/bsps/lm32/milkymist/include/tm27.h
diff --git a/c/src/lib/libbsp/lm32/Makefile.am b/c/src/lib/libbsp/lm32/Makefile.am
index c25b2d3f99..ae304be3e8 100644
--- a/c/src/lib/libbsp/lm32/Makefile.am
+++ b/c/src/lib/libbsp/lm32/Makefile.am
@@ -5,3 +5,4 @@ _SUBDIRS = @RTEMS_BSP_FAMILY@
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
+include $(srcdir)/../../../../../bsps/lm32/headers.am
diff --git a/c/src/lib/libbsp/lm32/configure.ac b/c/src/lib/libbsp/lm32/configure.ac
index 79debe1a36..ce06e84b0d 100644
--- a/c/src/lib/libbsp/lm32/configure.ac
+++ b/c/src/lib/libbsp/lm32/configure.ac
@@ -4,6 +4,8 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-lm32],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([../lm32])
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/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index c2bbe61944..1cc202819a 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -4,27 +4,19 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
+dist_project_lib_DATA = startup/bsp_specs
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/system_conf.h
EXTRA_DIST += ../../lm32/shared/start/start.S
start.$(OBJEXT): ../../lm32/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 =
@@ -62,5 +54,5 @@ libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/lm32/lm32_evr/headers.am
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
index 9a23e7cacc..93426ffdbc 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
+++ b/c/src/lib/libbsp/lm32/lm32_evr/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-lm32-lm32_evr],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/lm32_evr.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/lm32/lm32_evr/preinstall.am b/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am
deleted file mode 100644
index 2e6ad01d11..0000000000
--- a/c/src/lib/libbsp/lm32/lm32_evr/preinstall.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## Automatically generated by ampolish3 - Do not edit
-
-if AMPOLISH3
-$(srcdir)/preinstall.am: Makefile.am
- $(AMPOLISH3) $(srcdir)/Makefile.am > $(srcdir)/preinstall.am
-endif
-
-PREINSTALL_DIRS =
-DISTCLEANFILES += $(PREINSTALL_DIRS)
-
-all-am: $(PREINSTALL_FILES)
-
-PREINSTALL_FILES =
-CLEANFILES = $(PREINSTALL_FILES)
-
-all-local: $(TMPINSTALL_FILES)
-
-TMPINSTALL_FILES =
-CLEANFILES += $(TMPINSTALL_FILES)
-
-$(PROJECT_LIB)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_LIB)
- @: > $(PROJECT_LIB)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)
- @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/bsp/$(dirstamp):
- @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
- @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-
-$(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
-PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
-
-$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
-
-$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
-
-$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
-
-$(PROJECT_INCLUDE)/system_conf.h: include/system_conf.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/system_conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/system_conf.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/lm32/lm32_evr/bsp_specs b/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/bsp_specs
+++ b/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index c120caa3b2..ee3161a86d 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -4,43 +4,19 @@ EXTRA_DIST =
include $(top_srcdir)/../../../../automake/compile.am
include $(top_srcdir)/../../bsp.am
-include_bspdir = $(includedir)/bsp
-
-dist_project_lib_DATA = bsp_specs
-
-include_HEADERS = include/bsp.h
-include_HEADERS += include/tm27.h
-
-include_bsp_HEADERS = ../../lm32/shared/include/irq.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_gpio/milkymist_gpio.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_buttons/milkymist_buttons.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_ac97/milkymist_ac97.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_tmu/milkymist_tmu.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_memcard/milkymist_memcard.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_flash/milkymist_flash.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_dmx/milkymist_dmx.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_midi/milkymist_midi.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_ir/milkymist_ir.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_video/milkymist_video.h
-include_bsp_HEADERS += ../../lm32/shared/milkymist_versions/milkymist_versions.h
-
-nodist_include_HEADERS = include/bspopts.h
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
+dist_project_lib_DATA = startup/bsp_specs
+
DISTCLEANFILES = include/bspopts.h
noinst_PROGRAMS =
-include_HEADERS += include/system_conf.h
EXTRA_DIST += ../../lm32/shared/start/start.S
start.$(OBJEXT): ../../lm32/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 =
@@ -124,5 +100,5 @@ network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
libbsp_a_LIBADD += network.rel
endif
-include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/lm32/milkymist/headers.am
diff --git a/c/src/lib/libbsp/lm32/milkymist/configure.ac b/c/src/lib/libbsp/lm32/milkymist/configure.ac
index eb41c95255..7bd05a6edd 100644
--- a/c/src/lib/libbsp/lm32/milkymist/configure.ac
+++ b/c/src/lib/libbsp/lm32/milkymist/configure.ac
@@ -4,6 +4,9 @@ AC_PREREQ([2.69])
AC_INIT([rtems-c-src-lib-libbsp-lm32-milkymist],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
AC_CONFIG_SRCDIR([make/custom/milkymist.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/lm32/milkymist/preinstall.am b/c/src/lib/libbsp/lm32/milkymist/preinstall.am
deleted file mode 100644
index efdddba6c8..0000000000
--- a/c/src/lib/libbsp/lm32/milkymist/preinstall.am
+++ /dev/null
@@ -1,127 +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)/bsp/irq.h: ../../lm32/shared/include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.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/milkymist_gpio.h: ../../lm32/shared/milkymist_gpio/milkymist_gpio.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_gpio.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_buttons.h: ../../lm32/shared/milkymist_buttons/milkymist_buttons.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_buttons.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_buttons.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_ac97.h: ../../lm32/shared/milkymist_ac97/milkymist_ac97.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_ac97.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_ac97.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h: ../../lm32/shared/milkymist_usbinput/milkymist_usbinput.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_usbinput.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h: ../../lm32/shared/milkymist_pfpu/milkymist_pfpu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_pfpu.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_tmu.h: ../../lm32/shared/milkymist_tmu/milkymist_tmu.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_tmu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_tmu.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_memcard.h: ../../lm32/shared/milkymist_memcard/milkymist_memcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_memcard.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_memcard.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_flash.h: ../../lm32/shared/milkymist_flash/milkymist_flash.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_flash.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_dmx.h: ../../lm32/shared/milkymist_dmx/milkymist_dmx.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_dmx.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_dmx.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_midi.h: ../../lm32/shared/milkymist_midi/milkymist_midi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_midi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_midi.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_ir.h: ../../lm32/shared/milkymist_ir/milkymist_ir.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_ir.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_ir.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_video.h: ../../lm32/shared/milkymist_video/milkymist_video.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_video.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_video.h
-
-$(PROJECT_INCLUDE)/bsp/milkymist_versions.h: ../../lm32/shared/milkymist_versions/milkymist_versions.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/milkymist_versions.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/milkymist_versions.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)/system_conf.h: include/system_conf.h $(PROJECT_INCLUDE)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/system_conf.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/system_conf.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/lm32/milkymist/bsp_specs b/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/lm32/milkymist/bsp_specs
+++ b/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs