57 files changed, 11 insertions, 380 deletions
diff --git a/c/src/lib/libbsp/arm/tms570/include/bsp.h b/bsps/arm/tms570/include/bsp.h
index 456380627f..456380627f 100644
--- a/c/src/lib/libbsp/arm/tms570/include/bsp.h
+++ b/bsps/arm/tms570/include/bsp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/irq.h b/bsps/arm/tms570/include/bsp/irq.h
index 2952582453..2952582453 100644
--- a/c/src/lib/libbsp/arm/tms570/include/irq.h
+++ b/bsps/arm/tms570/include/bsp/irq.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h b/bsps/arm/tms570/include/bsp/system-clocks.h
index 0e1d1301d4..0e1d1301d4 100644
--- a/c/src/lib/libbsp/arm/tms570/include/system-clocks.h
+++ b/bsps/arm/tms570/include/bsp/system-clocks.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_adc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
index 1649fbeb4b..1649fbeb4b 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_adc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_adc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_ccmsr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
index 941ed54753..941ed54753 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_ccmsr.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_ccmsr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_crc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
index f1352f67b6..f1352f67b6 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_crc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_crc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcan.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
index c278f554ff..c278f554ff 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcan.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcan.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
index 4c90276523..4c90276523 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dcc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dcc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dma.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
index 717f05b010..717f05b010 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dma.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dma.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dmm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
index 55d656ef86..55d656ef86 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_dmm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_dmm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_efuse.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
index decf5bbeff..decf5bbeff 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_efuse.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_efuse.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
index c7c564cf49..c7c564cf49 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
index c6e63210aa..c6e63210aa 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emacm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_emacm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emif.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
index 0810fd097f..0810fd097f 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_emif.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_emif.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_esm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
index 3ea4b6b43c..3ea4b6b43c 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_esm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_esm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flash.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
index 6c5a127d0b..6c5a127d0b 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flash.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_flash.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flex_ray.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
index e077ab65fd..e077ab65fd 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_flex_ray.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_flex_ray.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_gio.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
index 3cb7851754..3cb7851754 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_gio.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_gio.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_htu.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
index 3df27be461..3df27be461 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_htu.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_htu.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_i2c.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
index 63ed3f8d95..63ed3f8d95 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_i2c.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_i2c.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_iomm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
index f6197e811c..f6197e811c 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_iomm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_iomm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_lin.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
index d2c3a3bfe8..d2c3a3bfe8 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_lin.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_lin.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_mdio.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
index 704a0bc8a4..704a0bc8a4 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_mdio.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_mdio.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_n2het.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
index 06b8bbeb0a..06b8bbeb0a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_n2het.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_n2het.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pbist.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
index 2c5ed29760..2c5ed29760 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pbist.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pbist.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pcr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
index 4d5613aa9f..4d5613aa9f 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pcr.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pcr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pll.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
index 1cb8b03308..1cb8b03308 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pll.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pll.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pmm.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
index c834b83999..c834b83999 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pmm.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pmm.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pom.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
index 1a4df19f8a..1a4df19f8a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_pom.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rti.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
index 029b3b5721..029b3b5721 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rti.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rtp.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
index cd54b29050..cd54b29050 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_rtp.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_rtp.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sci.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
index 6b954f7fcf..6b954f7fcf 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sci.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_spi.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
index 35335c61e0..35335c61e0 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_spi.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_spi.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_stc.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
index e935f450b8..e935f450b8 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_stc.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_stc.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
index e191970ad6..e191970ad6 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys2.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
index 29ec5a141c..29ec5a141c 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_sys2.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_sys2.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcr.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
index 5304504afc..5304504afc 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcr.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcr.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcram.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
index 1a48848e76..1a48848e76 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_tcram.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_tcram.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_vim.h b/bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
index d0347a4509..d0347a4509 100644
--- a/c/src/lib/libbsp/arm/tms570/include/ti_herc/reg_vim.h
+++ b/bsps/arm/tms570/include/bsp/ti_herc/reg_vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h b/bsps/arm/tms570/include/bsp/tms570-pinmux.h
index 8b93c66bfa..8b93c66bfa 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pinmux.h
+++ b/bsps/arm/tms570/include/bsp/tms570-pinmux.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pins.h b/bsps/arm/tms570/include/bsp/tms570-pins.h
index f8db69fa19..f8db69fa19 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pins.h
+++ b/bsps/arm/tms570/include/bsp/tms570-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h b/bsps/arm/tms570/include/bsp/tms570-pom.h
index 2c54a016dc..2c54a016dc 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-pom.h
+++ b/bsps/arm/tms570/include/bsp/tms570-pom.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h b/bsps/arm/tms570/include/bsp/tms570-rti.h
index 552db88a62..552db88a62 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-rti.h
+++ b/bsps/arm/tms570/include/bsp/tms570-rti.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h b/bsps/arm/tms570/include/bsp/tms570-sci-driver.h
index 61693ce0ff..61693ce0ff 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-sci-driver.h
+++ b/bsps/arm/tms570/include/bsp/tms570-sci-driver.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h b/bsps/arm/tms570/include/bsp/tms570-sci.h
index 9c502dcd6a..9c502dcd6a 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-sci.h
+++ b/bsps/arm/tms570/include/bsp/tms570-sci.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h b/bsps/arm/tms570/include/bsp/tms570-vim.h
index 9fa7e056f4..9fa7e056f4 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570-vim.h
+++ b/bsps/arm/tms570/include/bsp/tms570-vim.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570.h b/bsps/arm/tms570/include/bsp/tms570.h
index f278a93606..f278a93606 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570.h
+++ b/bsps/arm/tms570/include/bsp/tms570.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_hwinit.h b/bsps/arm/tms570/include/bsp/tms570_hwinit.h
index 2c84b6e5fa..2c84b6e5fa 100644
--- a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_hwinit.h
+++ b/bsps/arm/tms570/include/bsp/tms570_hwinit.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest.h b/bsps/arm/tms570/include/bsp/tms570_selftest.h
index bbec8c2adf..bbec8c2adf 100644
--- a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest.h
+++ b/bsps/arm/tms570/include/bsp/tms570_selftest.h
diff --git a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest_parity.h b/bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
index a1c3ec7b3e..a1c3ec7b3e 100644
--- a/c/src/lib/libbsp/arm/tms570/hwinit/tms570_selftest_parity.h
+++ b/bsps/arm/tms570/include/bsp/tms570_selftest_parity.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570lc4357-pins.h b/bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
index 2beeae8bab..2beeae8bab 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570lc4357-pins.h
+++ b/bsps/arm/tms570/include/bsp/tms570lc4357-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tms570ls3137zwt-pins.h b/bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
index 63c08e8ddb..63c08e8ddb 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tms570ls3137zwt-pins.h
+++ b/bsps/arm/tms570/include/bsp/tms570ls3137zwt-pins.h
diff --git a/c/src/lib/libbsp/arm/tms570/include/tm27.h b/bsps/arm/tms570/include/tm27.h
index 0dfa7bf628..0dfa7bf628 100644
--- a/c/src/lib/libbsp/arm/tms570/include/tm27.h
+++ b/bsps/arm/tms570/include/tm27.h
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 000e9ff44f..1ad63447d7 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -11,82 +11,12 @@ EXTRA_DIST =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-include_bspdir = $(includedir)/bsp
-
-include_bsp_ti_herculesdir = $(includedir)/bsp/ti_herc
-
-dist_project_lib_DATA = bsp_specs
+dist_project_lib_DATA = startup/bsp_specs
 
 # ----------------------------
 # ------  Headers
 # ----------------------------
 
-include_HEADERS = include/bsp.h
-
-nodist_include_HEADERS = include/bspopts.h
-
-nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h
-
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../shared/include/utility.h
-include_bsp_HEADERS += ../../shared/include/irq-generic.h
-include_bsp_HEADERS += ../../shared/include/irq-info.h
-include_bsp_HEADERS += ../../shared/include/stackalloc.h
-include_bsp_HEADERS += ../../shared/include/uart-output-char.h
-include_bsp_HEADERS += ../shared/include/start.h
-include_bsp_HEADERS += include/tms570.h
-include_bsp_HEADERS += include/tms570-sci.h
-include_bsp_HEADERS += include/irq.h
-include_bsp_HEADERS += include/tms570-rti.h
-include_bsp_HEADERS += include/tms570-vim.h
-include_bsp_HEADERS += include/tms570-pom.h
-include_bsp_HEADERS += include/tms570-sci-driver.h
-include_bsp_HEADERS += include/system-clocks.h
-include_bsp_HEADERS += include/tms570-pinmux.h
-
-include_bsp_HEADERS += include/tms570-pins.h
-include_bsp_HEADERS += include/tms570ls3137zwt-pins.h
-include_bsp_HEADERS += include/tms570lc4357-pins.h
-
-include_bsp_ti_hercules_HEADERS = include/ti_herc/reg_adc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_ccmsr.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_crc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcan.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dcc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dma.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_dmm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_efuse.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emacm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_emif.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_esm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flash.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_flex_ray.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_gio.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_htu.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_i2c.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_iomm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_lin.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_mdio.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_n2het.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pbist.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pll.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pmm.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rti.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_rtp.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sci.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcr.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_tcram.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_vim.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pom.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_spi.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_stc.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_sys2.h
-include_bsp_ti_hercules_HEADERS += include/ti_herc/reg_pcr.h
-
-include_HEADERS += include/tm27.h
-
 # ----------------------------
 # ------  Data
 # ----------------------------
@@ -95,12 +25,12 @@ EXTRA_DIST += ../shared/start/start.S
 start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
-project_lib_DATA += startup/linkcmds
 
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_with_loader
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_sdram
-EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram
+project_lib_DATA += linkcmds
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_intram
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_sdram
+dist_project_lib_DATA += startup/linkcmds.tms570ls3137_hdk_with_loader
 
 # ----------------------------
 # ------  LibBSP
@@ -109,7 +39,7 @@ EXTRA_DIST += startup/linkcmds.tms570ls3137_hdk_intram
 noinst_LIBRARIES = libbsp.a
 
 libbsp_a_SOURCES =
-libbsp_a_CPPFLAGS =
+libbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 libbsp_a_LIBADD =
 
 # Shared
@@ -184,10 +114,6 @@ libbsp_a_SOURCES += hwinit/tms570_selftest_par_std.c
 libbsp_a_SOURCES += hwinit/tms570_selftest_parity.c
 libbsp_a_SOURCES += hwinit/tms570_tcram_tests.c
 
-include_bsp_HEADERS += hwinit/tms570_selftest_parity.h
-include_bsp_HEADERS += hwinit/tms570_hwinit.h
-include_bsp_HEADERS += hwinit/tms570_selftest.h
-
 # Start hooks
 libbsp_a_SOURCES += hwinit/bspstarthooks-hwinit.c
 else
@@ -201,5 +127,5 @@ endif
 
 DISTCLEANFILES = include/bspopts.h
 
-include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../../automake/local.am
+include $(srcdir)/../../../../../../bsps/arm/tms570/headers.am
diff --git a/c/src/lib/libbsp/arm/tms570/configure.ac b/c/src/lib/libbsp/arm/tms570/configure.ac
index 37c5b61fc0..8a3789f5f2 100644
--- a/c/src/lib/libbsp/arm/tms570/configure.ac
+++ b/c/src/lib/libbsp/arm/tms570/configure.ac
@@ -10,6 +10,9 @@ AC_INIT([rtems-c-src-lib-libbsp-arm-tms570],[_RTEMS_VERSION],
 				[https://devel.rtems.org/newticket])
 AC_CONFIG_SRCDIR([make/custom/tms570ls3137_hdk.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])
@@ -55,7 +58,6 @@ RTEMS_BSPOPTS_HELP([TMS570_USE_HWINIT_STARTUP],[Include BSP startup code for TMS
 AM_CONDITIONAL(TMS570_USE_HWINIT_STARTUP,test "$TMS570_USE_HWINIT_STARTUP" = "1")
 
 RTEMS_BSP_CLEANUP_OPTIONS
-RTEMS_BSP_LINKCMDS
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/tms570/preinstall.am b/c/src/lib/libbsp/arm/tms570/preinstall.am
deleted file mode 100644
index 1f23f9ca7e..0000000000
--- a/c/src/lib/libbsp/arm/tms570/preinstall.am
+++ /dev/null
@@ -1,297 +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/ti_herc/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp/ti_herc
-	@: > $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/ti_herc/$(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)/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/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.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/stackalloc.h: ../../shared/include/stackalloc.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/stackalloc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/stackalloc.h
-
-$(PROJECT_INCLUDE)/bsp/uart-output-char.h: ../../shared/include/uart-output-char.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/uart-output-char.h
-
-$(PROJECT_INCLUDE)/bsp/start.h: ../shared/include/start.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/start.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/start.h
-
-$(PROJECT_INCLUDE)/bsp/tms570.h: include/tms570.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-sci.h: include/tms570-sci.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-sci.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_INCLUDE)/bsp/tms570-rti.h: include/tms570-rti.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-rti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-rti.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-vim.h: include/tms570-vim.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-vim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-vim.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pom.h: include/tms570-pom.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pom.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h: include/tms570-sci-driver.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-sci-driver.h
-
-$(PROJECT_INCLUDE)/bsp/system-clocks.h: include/system-clocks.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/system-clocks.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/system-clocks.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pinmux.h: include/tms570-pinmux.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pinmux.h
-
-$(PROJECT_INCLUDE)/bsp/tms570-pins.h: include/tms570-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570-pins.h
-
-$(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h: include/tms570ls3137zwt-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570ls3137zwt-pins.h
-
-$(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h: include/tms570lc4357-pins.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570lc4357-pins.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h: include/ti_herc/reg_adc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_adc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h: include/ti_herc/reg_ccmsr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_ccmsr.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h: include/ti_herc/reg_crc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_crc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h: include/ti_herc/reg_dcan.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcan.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h: include/ti_herc/reg_dcc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dcc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h: include/ti_herc/reg_dma.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dma.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h: include/ti_herc/reg_dmm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_dmm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h: include/ti_herc/reg_efuse.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_efuse.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h: include/ti_herc/reg_emacc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h: include/ti_herc/reg_emacm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emacm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h: include/ti_herc/reg_emif.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_emif.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h: include/ti_herc/reg_esm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_esm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h: include/ti_herc/reg_flash.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flash.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h: include/ti_herc/reg_flex_ray.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_flex_ray.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h: include/ti_herc/reg_gio.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_gio.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h: include/ti_herc/reg_htu.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_htu.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h: include/ti_herc/reg_i2c.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_i2c.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h: include/ti_herc/reg_iomm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_iomm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h: include/ti_herc/reg_lin.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_lin.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h: include/ti_herc/reg_mdio.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_mdio.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h: include/ti_herc/reg_n2het.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_n2het.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h: include/ti_herc/reg_pbist.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pbist.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h: include/ti_herc/reg_pll.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pll.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h: include/ti_herc/reg_pmm.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pmm.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h: include/ti_herc/reg_rti.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rti.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h: include/ti_herc/reg_rtp.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_rtp.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h: include/ti_herc/reg_sci.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sci.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h: include/ti_herc/reg_tcr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcr.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h: include/ti_herc/reg_tcram.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_tcram.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h: include/ti_herc/reg_vim.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_vim.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h: include/ti_herc/reg_pom.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pom.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h: include/ti_herc/reg_spi.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_spi.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h: include/ti_herc/reg_stc.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_stc.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h: include/ti_herc/reg_sys.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h: include/ti_herc/reg_sys2.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_sys2.h
-
-$(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h: include/ti_herc/reg_pcr.h $(PROJECT_INCLUDE)/bsp/ti_herc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/ti_herc/reg_pcr.h
-
-$(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.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
-TMPINSTALL_FILES += $(PROJECT_LIB)/linkcmds
-
-if TMS570_USE_HWINIT_STARTUP
-$(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h: hwinit/tms570_selftest_parity.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_selftest_parity.h
-
-$(PROJECT_INCLUDE)/bsp/tms570_hwinit.h: hwinit/tms570_hwinit.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_hwinit.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_hwinit.h
-
-$(PROJECT_INCLUDE)/bsp/tms570_selftest.h: hwinit/tms570_selftest.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tms570_selftest.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tms570_selftest.h
-endif
diff --git a/c/src/lib/libbsp/arm/tms570/bsp_specs b/c/src/lib/libbsp/arm/tms570/startup/bsp_specs
index 9c4b57c578..9c4b57c578 100644
--- a/c/src/lib/libbsp/arm/tms570/bsp_specs
+++ b/c/src/lib/libbsp/arm/tms570/startup/bsp_specs