bsps: Move startup files to bsps

Adjust build support files to new directory layout.

This patch is a part of the BSP source reorganization.

Update #3285.

653 files changed, 559 insertions, 560 deletions

diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bsp_specs b/bsps/arm/altera-cyclone-v/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bsp_specs
+++ b/bsps/arm/altera-cyclone-v/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c b/bsps/arm/altera-cyclone-v/start/bspclean.c
index 8b95deb801..8b95deb801 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspclean.c
+++ b/bsps/arm/altera-cyclone-v/start/bspclean.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspgetworkarea.c b/bsps/arm/altera-cyclone-v/start/bspgetworkarea.c
index a3c702de98..a3c702de98 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspgetworkarea.c
+++ b/bsps/arm/altera-cyclone-v/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspreset.c b/bsps/arm/altera-cyclone-v/start/bspreset.c
index c4af106fed..c4af106fed 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspreset.c
+++ b/bsps/arm/altera-cyclone-v/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c b/bsps/arm/altera-cyclone-v/start/bspsmp.c
index 9c3c9dcffe..9c3c9dcffe 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspsmp.c
+++ b/bsps/arm/altera-cyclone-v/start/bspsmp.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c b/bsps/arm/altera-cyclone-v/start/bspstart.c
index 0345a4c0a7..0345a4c0a7 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c
+++ b/bsps/arm/altera-cyclone-v/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c b/bsps/arm/altera-cyclone-v/start/bspstarthooks.c
index 69a178e3ad..69a178e3ad 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstarthooks.c
+++ b/bsps/arm/altera-cyclone-v/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/linkcmds.altcycv b/bsps/arm/altera-cyclone-v/start/linkcmds.altcycv
index 810c4eb1b8..810c4eb1b8 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/linkcmds.altcycv
+++ b/bsps/arm/altera-cyclone-v/start/linkcmds.altcycv
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/linkcmds.altcycv_devkit b/bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit
index 546db0e123..546db0e123 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/linkcmds.altcycv_devkit
+++ b/bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/linkcmds.altcycv_devkit_smp b/bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit_smp
index 2da086579f..2da086579f 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/linkcmds.altcycv_devkit_smp
+++ b/bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit_smp
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/mmu-config.c b/bsps/arm/altera-cyclone-v/start/mmu-config.c
index 9d56e5c8f5..9d56e5c8f5 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/startup/mmu-config.c
+++ b/bsps/arm/altera-cyclone-v/start/mmu-config.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/bsp_specs b/bsps/arm/atsam/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/bsp_specs
+++ b/bsps/arm/atsam/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/atsam/startup/bspstart.c b/bsps/arm/atsam/start/bspstart.c
index b463bab696..b463bab696 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/bspstart.c
+++ b/bsps/arm/atsam/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/bspstarthooks.c b/bsps/arm/atsam/start/bspstarthooks.c
index 697ec88d67..697ec88d67 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/bspstarthooks.c
+++ b/bsps/arm/atsam/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/getentropy-trng.c b/bsps/arm/atsam/start/getentropy-trng.c
index 11e24dcda1..11e24dcda1 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/getentropy-trng.c
+++ b/bsps/arm/atsam/start/getentropy-trng.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/linkcmds b/bsps/arm/atsam/start/linkcmds
index 79cdfc2b18..79cdfc2b18 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/linkcmds
+++ b/bsps/arm/atsam/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.intsram b/bsps/arm/atsam/start/linkcmds.intsram
index 3e9d07e61c..3e9d07e61c 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.intsram
+++ b/bsps/arm/atsam/start/linkcmds.intsram
diff --git a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.memory.in b/bsps/arm/atsam/start/linkcmds.memory.in
index de4d818283..de4d818283 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.memory.in
+++ b/bsps/arm/atsam/start/linkcmds.memory.in
diff --git a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.qspiflash b/bsps/arm/atsam/start/linkcmds.qspiflash
index d7529f7484..d7529f7484 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.qspiflash
+++ b/bsps/arm/atsam/start/linkcmds.qspiflash
diff --git a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.sdram b/bsps/arm/atsam/start/linkcmds.sdram
index 958b128c6a..958b128c6a 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/linkcmds.sdram
+++ b/bsps/arm/atsam/start/linkcmds.sdram
diff --git a/c/src/lib/libbsp/arm/atsam/startup/pin-config.c b/bsps/arm/atsam/start/pin-config.c
index 8a18ae8df7..8a18ae8df7 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/pin-config.c
+++ b/bsps/arm/atsam/start/pin-config.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/pmc-config.c b/bsps/arm/atsam/start/pmc-config.c
index 41902d03dd..41902d03dd 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/pmc-config.c
+++ b/bsps/arm/atsam/start/pmc-config.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/power-clock.c b/bsps/arm/atsam/start/power-clock.c
index e04933285e..e04933285e 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/power-clock.c
+++ b/bsps/arm/atsam/start/power-clock.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/power-rtc.c b/bsps/arm/atsam/start/power-rtc.c
index b60235ac29..b60235ac29 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/power-rtc.c
+++ b/bsps/arm/atsam/start/power-rtc.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/power.c b/bsps/arm/atsam/start/power.c
index f9b5a3925d..f9b5a3925d 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/power.c
+++ b/bsps/arm/atsam/start/power.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/restart.c b/bsps/arm/atsam/start/restart.c
index 9934fbd298..9934fbd298 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/restart.c
+++ b/bsps/arm/atsam/start/restart.c
diff --git a/c/src/lib/libbsp/arm/atsam/startup/sdram-config.c b/bsps/arm/atsam/start/sdram-config.c
index a2f1158377..a2f1158377 100644
--- a/c/src/lib/libbsp/arm/atsam/startup/sdram-config.c
+++ b/bsps/arm/atsam/start/sdram-config.c
diff --git a/c/src/lib/libbsp/arm/beagle/startup/bsp_specs b/bsps/arm/beagle/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/beagle/startup/bsp_specs
+++ b/bsps/arm/beagle/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/beagle/startup/bspreset.c b/bsps/arm/beagle/start/bspreset.c
index 5865b7badf..5865b7badf 100644
--- a/c/src/lib/libbsp/arm/beagle/startup/bspreset.c
+++ b/bsps/arm/beagle/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/beagle/startup/bspstart.c b/bsps/arm/beagle/start/bspstart.c
index 292b576aef..292b576aef 100644
--- a/c/src/lib/libbsp/arm/beagle/startup/bspstart.c
+++ b/bsps/arm/beagle/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/beagle/startup/bspstarthooks.c b/bsps/arm/beagle/start/bspstarthooks.c
index 2efa3042a8..2efa3042a8 100644
--- a/c/src/lib/libbsp/arm/beagle/startup/bspstarthooks.c
+++ b/bsps/arm/beagle/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/beagle/startup/bspstartmmu.c b/bsps/arm/beagle/start/bspstartmmu.c
index 157edfa0a7..157edfa0a7 100644
--- a/c/src/lib/libbsp/arm/beagle/startup/bspstartmmu.c
+++ b/bsps/arm/beagle/start/bspstartmmu.c
diff --git a/c/src/lib/libbsp/arm/beagle/startup/linkcmds.beagle b/bsps/arm/beagle/start/linkcmds.beagle
index 20ea3eb195..20ea3eb195 100644
--- a/c/src/lib/libbsp/arm/beagle/startup/linkcmds.beagle
+++ b/bsps/arm/beagle/start/linkcmds.beagle
diff --git a/c/src/lib/libbsp/arm/csb336/startup/bsp_specs b/bsps/arm/csb336/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/bsp_specs
+++ b/bsps/arm/csb336/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/bsps/arm/csb336/start/bspstart.c
index 8970dfbe4a..8970dfbe4a 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
+++ b/bsps/arm/csb336/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/csb336/startup/linkcmds b/bsps/arm/csb336/start/linkcmds
index 2f6f8bd89d..2f6f8bd89d 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/linkcmds
+++ b/bsps/arm/csb336/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/csb336/startup/memmap.c b/bsps/arm/csb336/start/memmap.c
index a61fc6e2cf..a61fc6e2cf 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/memmap.c
+++ b/bsps/arm/csb336/start/memmap.c
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bsp_specs b/bsps/arm/csb337/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bsp_specs
+++ b/bsps/arm/csb337/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspreset.c b/bsps/arm/csb337/start/bspreset.c
index a4605dcaf3..a4605dcaf3 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bspreset.c
+++ b/bsps/arm/csb337/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/bsps/arm/csb337/start/bspstart.c
index a47198598c..a47198598c 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
+++ b/bsps/arm/csb337/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337 b/bsps/arm/csb337/start/linkcmds.csb337
index f59a33c703..f59a33c703 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb337
+++ b/bsps/arm/csb337/start/linkcmds.csb337
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637 b/bsps/arm/csb337/start/linkcmds.csb637
index 91a34b7229..91a34b7229 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds.csb637
+++ b/bsps/arm/csb337/start/linkcmds.csb637
diff --git a/c/src/lib/libbsp/arm/csb337/startup/memmap.c b/bsps/arm/csb337/start/memmap.c
index bdd5487432..bdd5487432 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/memmap.c
+++ b/bsps/arm/csb337/start/memmap.c
diff --git a/c/src/lib/libbsp/arm/csb337/startup/pmc.c b/bsps/arm/csb337/start/pmc.c
index a15bf3c075..a15bf3c075 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/pmc.c
+++ b/bsps/arm/csb337/start/pmc.c
diff --git a/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c b/bsps/arm/csb337/start/umonsupp.c
index d4bf731c5d..d4bf731c5d 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/umonsupp.c
+++ b/bsps/arm/csb337/start/umonsupp.c
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bsp_specs b/bsps/arm/edb7312/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/bsp_specs
+++ b/bsps/arm/edb7312/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c b/bsps/arm/edb7312/start/bspreset.c
index 436bdf09e4..436bdf09e4 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/bspreset.c
+++ b/bsps/arm/edb7312/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/bsps/arm/edb7312/start/bspstart.c
index 0f9c64d2d8..0f9c64d2d8 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
+++ b/bsps/arm/edb7312/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds b/bsps/arm/edb7312/start/linkcmds
index a0afc0ad5e..a0afc0ad5e 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
+++ b/bsps/arm/edb7312/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/bsp_specs b/bsps/arm/gdbarmsim/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/bsp_specs
+++ b/bsps/arm/gdbarmsim/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c b/bsps/arm/gdbarmsim/start/bspreset.c
index b32c80e4e1..b32c80e4e1 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/bspreset.c
+++ b/bsps/arm/gdbarmsim/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/bspstart.c b/bsps/arm/gdbarmsim/start/bspstart.c
index de3126499d..de3126499d 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/bspstart.c
+++ b/bsps/arm/gdbarmsim/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/bspstarthooks.c b/bsps/arm/gdbarmsim/start/bspstarthooks.c
index 996d35859d..996d35859d 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/bspstarthooks.c
+++ b/bsps/arm/gdbarmsim/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/linkcmds b/bsps/arm/gdbarmsim/start/linkcmds
index 536dbf5fee..536dbf5fee 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/linkcmds
+++ b/bsps/arm/gdbarmsim/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c b/bsps/arm/gdbarmsim/start/syscalls.c
index 2e761dd28b..2e761dd28b 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/startup/syscalls.c
+++ b/bsps/arm/gdbarmsim/start/syscalls.c
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/bsp_specs b/bsps/arm/gumstix/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/bsp_specs
+++ b/bsps/arm/gumstix/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/bspreset.c b/bsps/arm/gumstix/start/bspreset.c
index ab7c5ffc8f..ab7c5ffc8f 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/bspreset.c
+++ b/bsps/arm/gumstix/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c b/bsps/arm/gumstix/start/bspstart.c
index f86bf3d6e3..f86bf3d6e3 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c
+++ b/bsps/arm/gumstix/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/linkcmds b/bsps/arm/gumstix/start/linkcmds
index 08cb2fc47a..08cb2fc47a 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/linkcmds
+++ b/bsps/arm/gumstix/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/gumstix/startup/memmap.c b/bsps/arm/gumstix/start/memmap.c
index 8923083576..8923083576 100644
--- a/c/src/lib/libbsp/arm/gumstix/startup/memmap.c
+++ b/bsps/arm/gumstix/start/memmap.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/bsp_specs b/bsps/arm/imx/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bsp_specs
+++ b/bsps/arm/imx/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspreset.c b/bsps/arm/imx/start/bspreset.c
index c3c9f69566..c3c9f69566 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bspreset.c
+++ b/bsps/arm/imx/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspsmp.c b/bsps/arm/imx/start/bspsmp.c
index 51c7aef12a..51c7aef12a 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bspsmp.c
+++ b/bsps/arm/imx/start/bspsmp.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspstart.c b/bsps/arm/imx/start/bspstart.c
index 046336655b..046336655b 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bspstart.c
+++ b/bsps/arm/imx/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspstarthooks.c b/bsps/arm/imx/start/bspstarthooks.c
index c75b03415b..c75b03415b 100644
--- a/c/src/lib/libbsp/arm/imx/startup/bspstarthooks.c
+++ b/bsps/arm/imx/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/ccm.c b/bsps/arm/imx/start/ccm.c
index bbb72db639..bbb72db639 100644
--- a/c/src/lib/libbsp/arm/imx/startup/ccm.c
+++ b/bsps/arm/imx/start/ccm.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/imx_iomux.c b/bsps/arm/imx/start/imx_iomux.c
index cd4591fa6f..cd4591fa6f 100644
--- a/c/src/lib/libbsp/arm/imx/startup/imx_iomux.c
+++ b/bsps/arm/imx/start/imx_iomux.c
diff --git a/c/src/lib/libbsp/arm/imx/startup/linkcmds.imx7 b/bsps/arm/imx/start/linkcmds.imx7
index 750e1def1d..750e1def1d 100644
--- a/c/src/lib/libbsp/arm/imx/startup/linkcmds.imx7
+++ b/bsps/arm/imx/start/linkcmds.imx7
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/bsp_specs b/bsps/arm/lm3s69xx/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/bsp_specs
+++ b/bsps/arm/lm3s69xx/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/bspstart.c b/bsps/arm/lm3s69xx/start/bspstart.c
index da3029e58c..da3029e58c 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/bspstart.c
+++ b/bsps/arm/lm3s69xx/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/bspstarthook.c b/bsps/arm/lm3s69xx/start/bspstarthook.c
index 0524577ea7..0524577ea7 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/bspstarthook.c
+++ b/bsps/arm/lm3s69xx/start/bspstarthook.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/io.c b/bsps/arm/lm3s69xx/start/io.c
index b476e7b6dd..b476e7b6dd 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/io.c
+++ b/bsps/arm/lm3s69xx/start/io.c
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s3749 b/bsps/arm/lm3s69xx/start/linkcmds.lm3s3749
index ff165c7835..ff165c7835 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s3749
+++ b/bsps/arm/lm3s69xx/start/linkcmds.lm3s3749
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 b/bsps/arm/lm3s69xx/start/linkcmds.lm3s6965
index 02d2487dc9..02d2487dc9 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965
+++ b/bsps/arm/lm3s69xx/start/linkcmds.lm3s6965
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965_qemu b/bsps/arm/lm3s69xx/start/linkcmds.lm3s6965_qemu
index a4d3a1972d..a4d3a1972d 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965_qemu
+++ b/bsps/arm/lm3s69xx/start/linkcmds.lm3s6965_qemu
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm4f120 b/bsps/arm/lm3s69xx/start/linkcmds.lm4f120
index e995a3ddbf..e995a3ddbf 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm4f120
+++ b/bsps/arm/lm3s69xx/start/linkcmds.lm4f120
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/syscon.c b/bsps/arm/lm3s69xx/start/syscon.c
index 1f5a1a3596..1f5a1a3596 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/startup/syscon.c
+++ b/bsps/arm/lm3s69xx/start/syscon.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/startup/bsp_specs b/bsps/arm/lpc176x/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lpc176x/startup/bsp_specs
+++ b/bsps/arm/lpc176x/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc176x/startup/bspstart.c b/bsps/arm/lpc176x/start/bspstart.c
index f1aba444fc..f1aba444fc 100644
--- a/c/src/lib/libbsp/arm/lpc176x/startup/bspstart.c
+++ b/bsps/arm/lpc176x/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/startup/bspstarthooks.c b/bsps/arm/lpc176x/start/bspstarthooks.c
index a60c5bdf89..a60c5bdf89 100644
--- a/c/src/lib/libbsp/arm/lpc176x/startup/bspstarthooks.c
+++ b/bsps/arm/lpc176x/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/startup/linkcmds.lpc1768_mbed b/bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed
index 133d2f487c..133d2f487c 100644
--- a/c/src/lib/libbsp/arm/lpc176x/startup/linkcmds.lpc1768_mbed
+++ b/bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed
diff --git a/c/src/lib/libbsp/arm/lpc176x/startup/linkcmds.lpc1768_mbed_ahb_ram b/bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed_ahb_ram
index 75bdd75d83..75bdd75d83 100644
--- a/c/src/lib/libbsp/arm/lpc176x/startup/linkcmds.lpc1768_mbed_ahb_ram
+++ b/bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed_ahb_ram
diff --git a/c/src/lib/libbsp/arm/lpc176x/startup/linkcmds.lpc1768_mbed_ahb_ram_eth b/bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed_ahb_ram_eth
index 7d91d8a5ef..7d91d8a5ef 100644
--- a/c/src/lib/libbsp/arm/lpc176x/startup/linkcmds.lpc1768_mbed_ahb_ram_eth
+++ b/bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed_ahb_ram_eth
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/bsp_specs b/bsps/arm/lpc24xx/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/bsp_specs
+++ b/bsps/arm/lpc24xx/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/bspreset-armv4.c b/bsps/arm/lpc24xx/start/bspreset-armv4.c
index c53b4e2447..c53b4e2447 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/bspreset-armv4.c
+++ b/bsps/arm/lpc24xx/start/bspreset-armv4.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c b/bsps/arm/lpc24xx/start/bspstart.c
index 6f00f35f99..6f00f35f99 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/bspstart.c
+++ b/bsps/arm/lpc24xx/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c b/bsps/arm/lpc24xx/start/bspstarthooks.c
index 6ceb066935..6ceb066935 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/bspstarthooks.c
+++ b/bsps/arm/lpc24xx/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c b/bsps/arm/lpc24xx/start/fb-config.c
index d1fa33c95a..d1fa33c95a 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/fb-config.c
+++ b/bsps/arm/lpc24xx/start/fb-config.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_ea_ram
index d98626108d..d98626108d 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_ea_ram
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_ea_rom_int
index db8c27f37f..db8c27f37f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_ea_rom_int
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_plx800_ram b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_plx800_ram
index e507877a84..e507877a84 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_plx800_ram
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_plx800_ram
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_plx800_rom_int b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_plx800_rom_int
index 2ae0a58840..2ae0a58840 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_plx800_rom_int
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc17xx_plx800_rom_int
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc2362 b/bsps/arm/lpc24xx/start/linkcmds.lpc2362
index e5bae18075..e5bae18075 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc2362
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc2362
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc23xx_tli800 b/bsps/arm/lpc24xx/start/linkcmds.lpc23xx_tli800
index 697b040a84..697b040a84 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc23xx_tli800
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc23xx_tli800
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ea b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ea
index 80b1e13187..80b1e13187 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ea
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ea
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_ram b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_ram
index 9f421f3555..9f421f3555 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_ram
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_ram
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_ext b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_rom_ext
index 7618a342bd..7618a342bd 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_ext
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_rom_ext
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_int b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_rom_int
index 47b79e7b5c..47b79e7b5c 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_ncs_rom_int
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_rom_int
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_ram b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_plx800_ram
index 2dcc6d233f..2dcc6d233f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_ram
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_plx800_ram
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_rom_int b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_plx800_rom_int
index f00c1d8f93..f00c1d8f93 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc24xx_plx800_rom_int
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc24xx_plx800_rom_int
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc40xx_ea_ram b/bsps/arm/lpc24xx/start/linkcmds.lpc40xx_ea_ram
index d4535963cb..d4535963cb 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc40xx_ea_ram
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc40xx_ea_ram
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc40xx_ea_rom_int b/bsps/arm/lpc24xx/start/linkcmds.lpc40xx_ea_rom_int
index 612f4916d3..612f4916d3 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc40xx_ea_rom_int
+++ b/bsps/arm/lpc24xx/start/linkcmds.lpc40xx_ea_rom_int
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-emc-dynamic.c b/bsps/arm/lpc24xx/start/start-config-emc-dynamic.c
index 3a08f0b49d..3a08f0b49d 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-emc-dynamic.c
+++ b/bsps/arm/lpc24xx/start/start-config-emc-dynamic.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-emc-static.c b/bsps/arm/lpc24xx/start/start-config-emc-static.c
index 4a427664f6..4a427664f6 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-emc-static.c
+++ b/bsps/arm/lpc24xx/start/start-config-emc-static.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-mpu.c b/bsps/arm/lpc24xx/start/start-config-mpu.c
index 9d9846c69a..9d9846c69a 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-mpu.c
+++ b/bsps/arm/lpc24xx/start/start-config-mpu.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-pinsel.c b/bsps/arm/lpc24xx/start/start-config-pinsel.c
index db44099664..db44099664 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/startup/start-config-pinsel.c
+++ b/bsps/arm/lpc24xx/start/start-config-pinsel.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bsp_specs b/bsps/arm/lpc32xx/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/bsp_specs
+++ b/bsps/arm/lpc32xx/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c b/bsps/arm/lpc32xx/start/bspreset.c
index e3c4cfbbd2..e3c4cfbbd2 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspreset.c
+++ b/bsps/arm/lpc32xx/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstart.c b/bsps/arm/lpc32xx/start/bspstart.c
index 7ade16bbb8..7ade16bbb8 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstart.c
+++ b/bsps/arm/lpc32xx/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c b/bsps/arm/lpc32xx/start/bspstarthooks.c
index 1df21b4343..1df21b4343 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/bspstarthooks.c
+++ b/bsps/arm/lpc32xx/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx
index 200e7f3e04..200e7f3e04 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx
+++ b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx
index 127a82f79a..127a82f79a 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx
+++ b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1 b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx_stage_1
index eae076e235..eae076e235 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_1
+++ b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx_stage_1
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2 b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx_stage_2
index 2aa8c34091..2aa8c34091 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_mzx_stage_2
+++ b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx_stage_2
diff --git a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_phycore
index d874c46152..d874c46152 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/startup/linkcmds.lpc32xx_phycore
+++ b/bsps/arm/lpc32xx/start/linkcmds.lpc32xx_phycore
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bsp_specs b/bsps/arm/raspberrypi/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bsp_specs
+++ b/bsps/arm/raspberrypi/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspgetworkarea.c b/bsps/arm/raspberrypi/start/bspgetworkarea.c
index 6a43e3c437..6a43e3c437 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspgetworkarea.c
+++ b/bsps/arm/raspberrypi/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c b/bsps/arm/raspberrypi/start/bspreset.c
index 98c28bea9d..98c28bea9d 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspreset.c
+++ b/bsps/arm/raspberrypi/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspsmp.c b/bsps/arm/raspberrypi/start/bspsmp.c
index c3e5451442..c3e5451442 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspsmp.c
+++ b/bsps/arm/raspberrypi/start/bspsmp.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspsmp_init.c b/bsps/arm/raspberrypi/start/bspsmp_init.c
index 8c8cd74712..8c8cd74712 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspsmp_init.c
+++ b/bsps/arm/raspberrypi/start/bspsmp_init.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspstart.c b/bsps/arm/raspberrypi/start/bspstart.c
index c5786bfa4a..c5786bfa4a 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspstart.c
+++ b/bsps/arm/raspberrypi/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/bspstarthooks.c b/bsps/arm/raspberrypi/start/bspstarthooks.c
index 165a555880..165a555880 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/bspstarthooks.c
+++ b/bsps/arm/raspberrypi/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/cmdline.c b/bsps/arm/raspberrypi/start/cmdline.c
index 222b21eb63..222b21eb63 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/cmdline.c
+++ b/bsps/arm/raspberrypi/start/cmdline.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in b/bsps/arm/raspberrypi/start/linkcmds.in
index 829716c11c..829716c11c 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in
+++ b/bsps/arm/raspberrypi/start/linkcmds.in
diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c b/bsps/arm/raspberrypi/start/mm_config_table.c
index 27fa76b355..27fa76b355 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/startup/mm_config_table.c
+++ b/bsps/arm/raspberrypi/start/mm_config_table.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bsp_specs b/bsps/arm/realview-pbx-a9/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bsp_specs
+++ b/bsps/arm/realview-pbx-a9/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspreset.c b/bsps/arm/realview-pbx-a9/start/bspreset.c
index 15ff7193f1..15ff7193f1 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspreset.c
+++ b/bsps/arm/realview-pbx-a9/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspsmp.c b/bsps/arm/realview-pbx-a9/start/bspsmp.c
index 471e7e5f29..471e7e5f29 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspsmp.c
+++ b/bsps/arm/realview-pbx-a9/start/bspsmp.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c b/bsps/arm/realview-pbx-a9/start/bspstart.c
index 0be515c057..0be515c057 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstart.c
+++ b/bsps/arm/realview-pbx-a9/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c b/bsps/arm/realview-pbx-a9/start/bspstarthooks.c
index ab766e8626..ab766e8626 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/bspstarthooks.c
+++ b/bsps/arm/realview-pbx-a9/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/fb-config.c b/bsps/arm/realview-pbx-a9/start/fb-config.c
index a756c9ab22..a756c9ab22 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/fb-config.c
+++ b/bsps/arm/realview-pbx-a9/start/fb-config.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/linkcmds.realview_pbx_a9_qemu b/bsps/arm/realview-pbx-a9/start/linkcmds.realview_pbx_a9_qemu
index e3b5b471b4..e3b5b471b4 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/linkcmds.realview_pbx_a9_qemu
+++ b/bsps/arm/realview-pbx-a9/start/linkcmds.realview_pbx_a9_qemu
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/linkcmds.realview_pbx_a9_qemu_smp b/bsps/arm/realview-pbx-a9/start/linkcmds.realview_pbx_a9_qemu_smp
index d31c4f08ae..d31c4f08ae 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/startup/linkcmds.realview_pbx_a9_qemu_smp
+++ b/bsps/arm/realview-pbx-a9/start/linkcmds.realview_pbx_a9_qemu_smp
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs b/bsps/arm/rtl22xx/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bsp_specs
+++ b/bsps/arm/rtl22xx/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c b/bsps/arm/rtl22xx/start/bspreset.c
index 573b4a2aa8..573b4a2aa8 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspreset.c
+++ b/bsps/arm/rtl22xx/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/bsps/arm/rtl22xx/start/bspstart.c
index fa128d9054..fa128d9054 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
+++ b/bsps/arm/rtl22xx/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds b/bsps/arm/rtl22xx/start/linkcmds
index d39dcb12bd..d39dcb12bd 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
+++ b/bsps/arm/rtl22xx/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/shared/startup/bsp-start-in-hyp-support.S b/bsps/arm/shared/start/bsp-start-in-hyp-support.S
index b608c59fa8..b608c59fa8 100644
--- a/c/src/lib/libbsp/arm/shared/startup/bsp-start-in-hyp-support.S
+++ b/bsps/arm/shared/start/bsp-start-in-hyp-support.S
diff --git a/c/src/lib/libbsp/arm/shared/startup/bsp-start-init-registers.S b/bsps/arm/shared/start/bsp-start-init-registers.S
index 2e308ce5de..2e308ce5de 100644
--- a/c/src/lib/libbsp/arm/shared/startup/bsp-start-init-registers.S
+++ b/bsps/arm/shared/start/bsp-start-init-registers.S
diff --git a/c/src/lib/libbsp/arm/shared/startup/bsp-start-memcpy.S b/bsps/arm/shared/start/bsp-start-memcpy.S
index cb97eb47f8..cb97eb47f8 100644
--- a/c/src/lib/libbsp/arm/shared/startup/bsp-start-memcpy.S
+++ b/bsps/arm/shared/start/bsp-start-memcpy.S
diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv4 b/bsps/arm/shared/start/linkcmds.armv4
index 33e419f5be..33e419f5be 100644
--- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv4
+++ b/bsps/arm/shared/start/linkcmds.armv4
diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7m b/bsps/arm/shared/start/linkcmds.armv7m
index f0fb2cde1f..f0fb2cde1f 100644
--- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7m
+++ b/bsps/arm/shared/start/linkcmds.armv7m
diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base b/bsps/arm/shared/start/linkcmds.base
index c6314547eb..c6314547eb 100644
--- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.base
+++ b/bsps/arm/shared/start/linkcmds.base
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/bsp_specs b/bsps/arm/smdk2410/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/bsp_specs
+++ b/bsps/arm/smdk2410/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/bspidle.c b/bsps/arm/smdk2410/start/bspidle.c
index 0f96f1f09b..0f96f1f09b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/bspidle.c
+++ b/bsps/arm/smdk2410/start/bspidle.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c b/bsps/arm/smdk2410/start/bspreset.c
index 365a22f14f..365a22f14f 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/bspreset.c
+++ b/bsps/arm/smdk2410/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/bspstart.c b/bsps/arm/smdk2410/start/bspstart.c
index c70de1f291..c70de1f291 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/bspstart.c
+++ b/bsps/arm/smdk2410/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds b/bsps/arm/smdk2410/start/linkcmds
index 9cd68886a7..9cd68886a7 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
+++ b/bsps/arm/smdk2410/start/linkcmds
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/memmap.c b/bsps/arm/smdk2410/start/memmap.c
index 21ba35b21b..21ba35b21b 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/memmap.c
+++ b/bsps/arm/smdk2410/start/memmap.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/bsp_specs b/bsps/arm/stm32f4/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/bsp_specs
+++ b/bsps/arm/stm32f4/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/bspreset.c b/bsps/arm/stm32f4/start/bspreset.c
index ff46d4f86b..ff46d4f86b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/bspreset.c
+++ b/bsps/arm/stm32f4/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/bspstart.c b/bsps/arm/stm32f4/start/bspstart.c
index 8d4bf6b82b..8d4bf6b82b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/bspstart.c
+++ b/bsps/arm/stm32f4/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/bspstarthook.c b/bsps/arm/stm32f4/start/bspstarthook.c
index 8e9295b853..8e9295b853 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/bspstarthook.c
+++ b/bsps/arm/stm32f4/start/bspstarthook.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/io.c b/bsps/arm/stm32f4/start/io.c
index dcbdb70ff5..dcbdb70ff5 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/io.c
+++ b/bsps/arm/stm32f4/start/io.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f105rc b/bsps/arm/stm32f4/start/linkcmds.stm32f105rc
index d3ea200f2b..d3ea200f2b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f105rc
+++ b/bsps/arm/stm32f4/start/linkcmds.stm32f105rc
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4 b/bsps/arm/stm32f4/start/linkcmds.stm32f4
index 1d16cfdde9..1d16cfdde9 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4
+++ b/bsps/arm/stm32f4/start/linkcmds.stm32f4
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/rcc.c b/bsps/arm/stm32f4/start/rcc.c
index ed0b2f1610..ed0b2f1610 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/rcc.c
+++ b/bsps/arm/stm32f4/start/rcc.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/start-config-io.c b/bsps/arm/stm32f4/start/start-config-io.c
index 712fd0705b..712fd0705b 100644
--- a/c/src/lib/libbsp/arm/stm32f4/startup/start-config-io.c
+++ b/bsps/arm/stm32f4/start/start-config-io.c
diff --git a/c/src/lib/libbsp/arm/tms570/startup/bsp_specs b/bsps/arm/tms570/start/bsp_specs
index 9c4b57c578..9c4b57c578 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/bsp_specs
+++ b/bsps/arm/tms570/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/tms570/startup/bspreset.c b/bsps/arm/tms570/start/bspreset.c
index f6bdee27e1..f6bdee27e1 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/bspreset.c
+++ b/bsps/arm/tms570/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/tms570/startup/bspstart.c b/bsps/arm/tms570/start/bspstart.c
index 025bb741d2..025bb741d2 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/bspstart.c
+++ b/bsps/arm/tms570/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/tms570/startup/bspstarthooks.c b/bsps/arm/tms570/start/bspstarthooks.c
index a9e189b6b8..a9e189b6b8 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/bspstarthooks.c
+++ b/bsps/arm/tms570/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk
index a32562fc6b..a32562fc6b 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk
+++ b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk
diff --git a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk_intram b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_intram
index 7cb683de3d..7cb683de3d 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk_intram
+++ b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_intram
diff --git a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk_sdram b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_sdram
index 0117410467..0117410467 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk_sdram
+++ b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_sdram
diff --git a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk_with_loader b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_with_loader
index 940f303030..940f303030 100644
--- a/c/src/lib/libbsp/arm/tms570/startup/linkcmds.tms570ls3137_hdk_with_loader
+++ b/bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_with_loader
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs b/bsps/arm/xilinx-zynq/start/bsp_specs
index 47dd31d46b..47dd31d46b 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bsp_specs
+++ b/bsps/arm/xilinx-zynq/start/bsp_specs
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspreset.c b/bsps/arm/xilinx-zynq/start/bspreset.c
index b57354c9e2..b57354c9e2 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspreset.c
+++ b/bsps/arm/xilinx-zynq/start/bspreset.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspsmp.c b/bsps/arm/xilinx-zynq/start/bspsmp.c
index b516823243..b516823243 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspsmp.c
+++ b/bsps/arm/xilinx-zynq/start/bspsmp.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c b/bsps/arm/xilinx-zynq/start/bspstart.c
index 14a20df7ef..14a20df7ef 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c
+++ b/bsps/arm/xilinx-zynq/start/bspstart.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c b/bsps/arm/xilinx-zynq/start/bspstarthooks.c
index 5372380c24..5372380c24 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstarthooks.c
+++ b/bsps/arm/xilinx-zynq/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstartmmu.c b/bsps/arm/xilinx-zynq/start/bspstartmmu.c
index e0a7743e57..e0a7743e57 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstartmmu.c
+++ b/bsps/arm/xilinx-zynq/start/bspstartmmu.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in b/bsps/arm/xilinx-zynq/start/linkcmds.in
index 7fd6e2772d..7fd6e2772d 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/startup/linkcmds.in
+++ b/bsps/arm/xilinx-zynq/start/linkcmds.in
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/startup/bsp_specs b/bsps/bfin/TLL6527M/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/startup/bsp_specs
+++ b/bsps/bfin/TLL6527M/start/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c b/bsps/bfin/TLL6527M/start/bspstart.c
index 4c8302a7ba..4c8302a7ba 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/startup/bspstart.c
+++ b/bsps/bfin/TLL6527M/start/bspstart.c
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/startup/linkcmds b/bsps/bfin/TLL6527M/start/linkcmds
index 93d2a85d82..93d2a85d82 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/startup/linkcmds
+++ b/bsps/bfin/TLL6527M/start/linkcmds
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/startup/bsp_specs b/bsps/bfin/bf537Stamp/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/startup/bsp_specs
+++ b/bsps/bfin/bf537Stamp/start/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c b/bsps/bfin/bf537Stamp/start/bspstart.c
index ffc2d950c7..ffc2d950c7 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/startup/bspstart.c
+++ b/bsps/bfin/bf537Stamp/start/bspstart.c
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds b/bsps/bfin/bf537Stamp/start/linkcmds
index 47888ff798..47888ff798 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds
+++ b/bsps/bfin/bf537Stamp/start/linkcmds
diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs b/bsps/bfin/eZKit533/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/startup/bsp_specs
+++ b/bsps/bfin/eZKit533/start/bsp_specs
diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c b/bsps/bfin/eZKit533/start/bspstart.c
index 3579dd7766..3579dd7766 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/startup/bspstart.c
+++ b/bsps/bfin/eZKit533/start/bspstart.c
diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds b/bsps/bfin/eZKit533/start/linkcmds
index e66a599e1f..e66a599e1f 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds
+++ b/bsps/bfin/eZKit533/start/linkcmds
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs b/bsps/epiphany/epiphany_sim/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/startup/bsp_specs
+++ b/bsps/epiphany/epiphany_sim/start/bsp_specs
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds b/bsps/epiphany/epiphany_sim/start/linkcmds
index 07a4c29a32..07a4c29a32 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/startup/linkcmds
+++ b/bsps/epiphany/epiphany_sim/start/linkcmds
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c b/bsps/i386/pc386/start/bsp_fatal_halt.c
index 07bbd793e0..07bbd793e0 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bsp_fatal_halt.c
+++ b/bsps/i386/pc386/start/bsp_fatal_halt.c
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bsp_specs b/bsps/i386/pc386/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bsp_specs
+++ b/bsps/i386/pc386/start/bsp_specs
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspcmdline.c b/bsps/i386/pc386/start/bspcmdline.c
index d617863198..d617863198 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspcmdline.c
+++ b/bsps/i386/pc386/start/bspcmdline.c
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c b/bsps/i386/pc386/start/bspgetworkarea.c
index 21cb472607..21cb472607 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
+++ b/bsps/i386/pc386/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspidle.S b/bsps/i386/pc386/start/bspidle.S
index 740671afc1..740671afc1 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspidle.S
+++ b/bsps/i386/pc386/start/bspidle.S
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspreset.c b/bsps/i386/pc386/start/bspreset.c
index 0fbcd0f201..0fbcd0f201 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspreset.c
+++ b/bsps/i386/pc386/start/bspreset.c
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c b/bsps/i386/pc386/start/bspstart.c
index db1ca90cf4..db1ca90cf4 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspstart.c
+++ b/bsps/i386/pc386/start/bspstart.c
diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/bsps/i386/pc386/start/ldsegs.S
index b56bf836f0..b56bf836f0 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
+++ b/bsps/i386/pc386/start/ldsegs.S
diff --git a/c/src/lib/libbsp/i386/pc386/startup/linkcmds b/bsps/i386/pc386/start/linkcmds
index 5fc3444c9e..5fc3444c9e 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/linkcmds
+++ b/bsps/i386/pc386/start/linkcmds
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs b/bsps/lm32/lm32_evr/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/startup/bsp_specs
+++ b/bsps/lm32/lm32_evr/start/bsp_specs
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/startup/linkcmds b/bsps/lm32/lm32_evr/start/linkcmds
index 63747f33dc..63747f33dc 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/startup/linkcmds
+++ b/bsps/lm32/lm32_evr/start/linkcmds
diff --git a/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs b/bsps/lm32/milkymist/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/lm32/milkymist/startup/bsp_specs
+++ b/bsps/lm32/milkymist/start/bsp_specs
diff --git a/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c b/bsps/lm32/milkymist/start/bspclean.c
index b010292d06..b010292d06 100644
--- a/c/src/lib/libbsp/lm32/milkymist/startup/bspclean.c
+++ b/bsps/lm32/milkymist/start/bspclean.c
diff --git a/c/src/lib/libbsp/lm32/milkymist/startup/linkcmds b/bsps/lm32/milkymist/start/linkcmds
index 9c38414238..9c38414238 100644
--- a/c/src/lib/libbsp/lm32/milkymist/startup/linkcmds
+++ b/bsps/lm32/milkymist/start/linkcmds
diff --git a/c/src/lib/libbsp/lm32/shared/startup/bspreset.c b/bsps/lm32/shared/start/bspreset.c
index 0c41dc6f41..0c41dc6f41 100644
--- a/c/src/lib/libbsp/lm32/shared/startup/bspreset.c
+++ b/bsps/lm32/shared/start/bspreset.c
diff --git a/c/src/lib/libbsp/lm32/shared/startup/bspstart.c b/bsps/lm32/shared/start/bspstart.c
index 6a419e869e..6a419e869e 100644
--- a/c/src/lib/libbsp/lm32/shared/startup/bspstart.c
+++ b/bsps/lm32/shared/start/bspstart.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs b/bsps/m32c/m32cbsp/start/bsp_specs
index afa9f6badb..afa9f6badb 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/bsp_specs
+++ b/bsps/m32c/m32cbsp/start/bsp_specs
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/bspstart.c b/bsps/m32c/m32cbsp/start/bspstart.c
index 7fdd598ccf..7fdd598ccf 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/bspstart.c
+++ b/bsps/m32c/m32cbsp/start/bspstart.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/crtn.S b/bsps/m32c/m32cbsp/start/crtn.S
index 6004f28e05..6004f28e05 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/crtn.S
+++ b/bsps/m32c/m32cbsp/start/crtn.S
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds b/bsps/m32c/m32cbsp/start/linkcmds
index 48cc27e7ae..48cc27e7ae 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds
+++ b/bsps/m32c/m32cbsp/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs b/bsps/m68k/av5282/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/bsp_specs
+++ b/bsps/m68k/av5282/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c b/bsps/m68k/av5282/start/bspstart.c
index c2dd362a6d..c2dd362a6d 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c
+++ b/bsps/m68k/av5282/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/init5282.c b/bsps/m68k/av5282/start/init5282.c
index df5eedb2fd..df5eedb2fd 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/init5282.c
+++ b/bsps/m68k/av5282/start/init5282.c
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/linkcmds b/bsps/m68k/av5282/start/linkcmds
index ff0fdda163..ff0fdda163 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/linkcmds
+++ b/bsps/m68k/av5282/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash b/bsps/m68k/av5282/start/linkcmdsflash
index e194add7b8..e194add7b8 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash
+++ b/bsps/m68k/av5282/start/linkcmdsflash
diff --git a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram b/bsps/m68k/av5282/start/linkcmdsram
index 976c08a308..976c08a308 100644
--- a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram
+++ b/bsps/m68k/av5282/start/linkcmdsram
diff --git a/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs b/bsps/m68k/csb360/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/csb360/startup/bsp_specs
+++ b/bsps/m68k/csb360/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/csb360/startup/init5272.c b/bsps/m68k/csb360/start/init5272.c
index 267fd551b4..267fd551b4 100644
--- a/c/src/lib/libbsp/m68k/csb360/startup/init5272.c
+++ b/bsps/m68k/csb360/start/init5272.c
diff --git a/c/src/lib/libbsp/m68k/csb360/startup/linkcmds b/bsps/m68k/csb360/start/linkcmds
index 09670c156d..09670c156d 100644
--- a/c/src/lib/libbsp/m68k/csb360/startup/linkcmds
+++ b/bsps/m68k/csb360/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs b/bsps/m68k/gen68340/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/bsp_specs
+++ b/bsps/m68k/gen68340/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c b/bsps/m68k/gen68340/start/dumpanic.c
index 7f82ab3a77..7f82ab3a77 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/dumpanic.c
+++ b/bsps/m68k/gen68340/start/dumpanic.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c b/bsps/m68k/gen68340/start/init68340.c
index ee30f415e9..ee30f415e9 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/init68340.c
+++ b/bsps/m68k/gen68340/start/init68340.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/bsps/m68k/gen68340/start/linkcmds
index 860115930e..860115930e 100644
--- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds
+++ b/bsps/m68k/gen68340/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c b/bsps/m68k/gen68360/start/alloc360.c
index 53f90876e4..53f90876e4 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/alloc360.c
+++ b/bsps/m68k/gen68360/start/alloc360.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs b/bsps/m68k/gen68360/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/bsp_specs
+++ b/bsps/m68k/gen68360/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c b/bsps/m68k/gen68360/start/init68360.c
index 67fed27a3b..67fed27a3b 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/init68360.c
+++ b/bsps/m68k/gen68360/start/init68360.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds b/bsps/m68k/gen68360/start/linkcmds
index 4ffc8bb57a..4ffc8bb57a 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds
+++ b/bsps/m68k/gen68360/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.bootp b/bsps/m68k/gen68360/start/linkcmds.bootp
index ccd08a14a2..ccd08a14a2 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.bootp
+++ b/bsps/m68k/gen68360/start/linkcmds.bootp
diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom b/bsps/m68k/gen68360/start/linkcmds.prom
index 777700e6a1..777700e6a1 100644
--- a/c/src/lib/libbsp/m68k/gen68360/startup/linkcmds.prom
+++ b/bsps/m68k/gen68360/start/linkcmds.prom
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs b/bsps/m68k/genmcf548x/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/bsp_specs
+++ b/bsps/m68k/genmcf548x/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c b/bsps/m68k/genmcf548x/start/bspstart.c
index 6c1da2a738..6c1da2a738 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c
+++ b/bsps/m68k/genmcf548x/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c b/bsps/m68k/genmcf548x/start/init548x.c
index c83c061f31..c83c061f31 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c
+++ b/bsps/m68k/genmcf548x/start/init548x.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.COBRA5475 b/bsps/m68k/genmcf548x/start/linkcmds.COBRA5475
index 52bca8d018..52bca8d018 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.COBRA5475
+++ b/bsps/m68k/genmcf548x/start/linkcmds.COBRA5475
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine
index be746af7ff..be746af7ff 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine
+++ b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash
index 4db960f111..4db960f111 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash
+++ b/bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs b/bsps/m68k/mcf5206elite/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bsp_specs
+++ b/bsps/m68k/mcf5206elite/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/gdbinit b/bsps/m68k/mcf5206elite/start/gdbinit
index 9954b8cb9a..9954b8cb9a 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/gdbinit
+++ b/bsps/m68k/mcf5206elite/start/gdbinit
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c b/bsps/m68k/mcf5206elite/start/init5206e.c
index a128b81fd7..a128b81fd7 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c
+++ b/bsps/m68k/mcf5206elite/start/init5206e.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds b/bsps/m68k/mcf5206elite/start/linkcmds
index 817c80e298..817c80e298 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds
+++ b/bsps/m68k/mcf5206elite/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds.flash b/bsps/m68k/mcf5206elite/start/linkcmds.flash
index 8d429ab209..8d429ab209 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/linkcmds.flash
+++ b/bsps/m68k/mcf5206elite/start/linkcmds.flash
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs b/bsps/m68k/mcf52235/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/bsp_specs
+++ b/bsps/m68k/mcf52235/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/bspgetcpuclockspeed.c b/bsps/m68k/mcf52235/start/bspgetcpuclockspeed.c
index 563044394a..563044394a 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/bspgetcpuclockspeed.c
+++ b/bsps/m68k/mcf52235/start/bspgetcpuclockspeed.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/cfinit.c b/bsps/m68k/mcf52235/start/cfinit.c
index 0007f9a449..0007f9a449 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/cfinit.c
+++ b/bsps/m68k/mcf52235/start/cfinit.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c b/bsps/m68k/mcf52235/start/init52235.c
index d54b624fdd..d54b624fdd 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/init52235.c
+++ b/bsps/m68k/mcf52235/start/init52235.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/startup/linkcmds b/bsps/m68k/mcf52235/start/linkcmds
index 7c7755cc21..7c7755cc21 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/startup/linkcmds
+++ b/bsps/m68k/mcf52235/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs b/bsps/m68k/mcf5225x/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/bsp_specs
+++ b/bsps/m68k/mcf5225x/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c b/bsps/m68k/mcf5225x/start/bspclean.c
index 5cd1aed1e9..5cd1aed1e9 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspclean.c
+++ b/bsps/m68k/mcf5225x/start/bspclean.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspstart.c b/bsps/m68k/mcf5225x/start/bspstart.c
index d5e0f37dc8..d5e0f37dc8 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/bspstart.c
+++ b/bsps/m68k/mcf5225x/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c b/bsps/m68k/mcf5225x/start/init5225x.c
index caf7db1953..caf7db1953 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/init5225x.c
+++ b/bsps/m68k/mcf5225x/start/init5225x.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/startup/linkcmds b/bsps/m68k/mcf5225x/start/linkcmds
index 81d2058872..81d2058872 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/startup/linkcmds
+++ b/bsps/m68k/mcf5225x/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs b/bsps/m68k/mcf5235/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/bsp_specs
+++ b/bsps/m68k/mcf5235/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c b/bsps/m68k/mcf5235/start/bspgetcpuclockspeed.c
index 548caaa9b8..548caaa9b8 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspgetcpuclockspeed.c
+++ b/bsps/m68k/mcf5235/start/bspgetcpuclockspeed.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c b/bsps/m68k/mcf5235/start/bspstart.c
index 744d4c9142..744d4c9142 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c
+++ b/bsps/m68k/mcf5235/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/copyvectors.c b/bsps/m68k/mcf5235/start/copyvectors.c
index 2c54c31a44..2c54c31a44 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/copyvectors.c
+++ b/bsps/m68k/mcf5235/start/copyvectors.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c b/bsps/m68k/mcf5235/start/init5235.c
index 5066941be0..5066941be0 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
+++ b/bsps/m68k/mcf5235/start/init5235.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds b/bsps/m68k/mcf5235/start/linkcmds
index 660c931e26..660c931e26 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds
+++ b/bsps/m68k/mcf5235/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash b/bsps/m68k/mcf5235/start/linkcmdsflash
index 832424a2d9..832424a2d9 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash
+++ b/bsps/m68k/mcf5235/start/linkcmdsflash
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram b/bsps/m68k/mcf5235/start/linkcmdsram
index ec7483001e..ec7483001e 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram
+++ b/bsps/m68k/mcf5235/start/linkcmdsram
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs b/bsps/m68k/mcf5329/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/bsp_specs
+++ b/bsps/m68k/mcf5329/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/bspstart.c b/bsps/m68k/mcf5329/start/bspstart.c
index d5a258da47..d5a258da47 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/bspstart.c
+++ b/bsps/m68k/mcf5329/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/cfinit.c b/bsps/m68k/mcf5329/start/cfinit.c
index 1fe9015449..1fe9015449 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/cfinit.c
+++ b/bsps/m68k/mcf5329/start/cfinit.c
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c b/bsps/m68k/mcf5329/start/init5329.c
index 8719514736..8719514736 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/init5329.c
+++ b/bsps/m68k/mcf5329/start/init5329.c
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/linkcmds b/bsps/m68k/mcf5329/start/linkcmds
index 1982a91f7b..1982a91f7b 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/linkcmds
+++ b/bsps/m68k/mcf5329/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mcf5329/startup/linkcmdsflash b/bsps/m68k/mcf5329/start/linkcmdsflash
index af0cc4ee01..af0cc4ee01 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/startup/linkcmdsflash
+++ b/bsps/m68k/mcf5329/start/linkcmdsflash
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs b/bsps/m68k/mrm332/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/bsp_specs
+++ b/bsps/m68k/mrm332/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds b/bsps/m68k/mrm332/start/linkcmds
index 1ee7117d6b..1ee7117d6b 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds
+++ b/bsps/m68k/mrm332/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c b/bsps/m68k/mrm332/start/start_c.c
index 060c96b004..060c96b004 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/start_c.c
+++ b/bsps/m68k/mrm332/start/start_c.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs b/bsps/m68k/mvme147/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bsp_specs
+++ b/bsps/m68k/mvme147/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c b/bsps/m68k/mvme147/start/bspclean.c
index 6606b9a249..6606b9a249 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bspclean.c
+++ b/bsps/m68k/mvme147/start/bspclean.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c b/bsps/m68k/mvme147/start/bspstart.c
index cb5f84a075..cb5f84a075 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/bspstart.c
+++ b/bsps/m68k/mvme147/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds b/bsps/m68k/mvme147/start/linkcmds
index 6603a438f1..6603a438f1 100644
--- a/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds
+++ b/bsps/m68k/mvme147/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs b/bsps/m68k/mvme147s/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/startup/bsp_specs
+++ b/bsps/m68k/mvme147s/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c b/bsps/m68k/mvme147s/start/bspstart.c
index 497b644150..497b644150 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/startup/bspstart.c
+++ b/bsps/m68k/mvme147s/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds b/bsps/m68k/mvme147s/start/linkcmds
index 01be6d93b2..01be6d93b2 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds
+++ b/bsps/m68k/mvme147s/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs b/bsps/m68k/mvme162/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bsp_specs
+++ b/bsps/m68k/mvme162/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c b/bsps/m68k/mvme162/start/bspclean.c
index dd91f96b1a..dd91f96b1a 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c
+++ b/bsps/m68k/mvme162/start/bspclean.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/bsps/m68k/mvme162/start/bspstart.c
index 29e56e35ea..29e56e35ea 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c
+++ b/bsps/m68k/mvme162/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds b/bsps/m68k/mvme162/start/linkcmds
index fd77dcf147..fd77dcf147 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds
+++ b/bsps/m68k/mvme162/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c b/bsps/m68k/mvme162/start/page_table.c
index 3dbd05a56f..3dbd05a56f 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/page_table.c
+++ b/bsps/m68k/mvme162/start/page_table.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs b/bsps/m68k/mvme167/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bsp_specs
+++ b/bsps/m68k/mvme167/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c b/bsps/m68k/mvme167/start/bspclean.c
index 2dd980fdb4..2dd980fdb4 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspclean.c
+++ b/bsps/m68k/mvme167/start/bspclean.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c b/bsps/m68k/mvme167/start/bspstart.c
index 7ff6d2b118..7ff6d2b118 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/bspstart.c
+++ b/bsps/m68k/mvme167/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds b/bsps/m68k/mvme167/start/linkcmds
index dc50449b29..dc50449b29 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds
+++ b/bsps/m68k/mvme167/start/linkcmds
diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/page_table.c b/bsps/m68k/mvme167/start/page_table.c
index da50e511b0..da50e511b0 100644
--- a/c/src/lib/libbsp/m68k/mvme167/startup/page_table.c
+++ b/bsps/m68k/mvme167/start/page_table.c
diff --git a/c/src/lib/libbsp/m68k/shared/startup/linkcmds.base b/bsps/m68k/shared/start/linkcmds.base
index 56af70d1da..56af70d1da 100644
--- a/c/src/lib/libbsp/m68k/shared/startup/linkcmds.base
+++ b/bsps/m68k/shared/start/linkcmds.base
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs b/bsps/m68k/uC5282/start/bsp_specs
index 3a20757667..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bsp_specs
+++ b/bsps/m68k/uC5282/start/bsp_specs
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c b/bsps/m68k/uC5282/start/bspclean.c
index a344efd7bb..a344efd7bb 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspclean.c
+++ b/bsps/m68k/uC5282/start/bspclean.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspreset.c b/bsps/m68k/uC5282/start/bspreset.c
index b93fbb409f..b93fbb409f 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspreset.c
+++ b/bsps/m68k/uC5282/start/bspreset.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/bsps/m68k/uC5282/start/bspstart.c
index 33ce737ceb..33ce737ceb 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c
+++ b/bsps/m68k/uC5282/start/bspstart.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c b/bsps/m68k/uC5282/start/init5282.c
index 201ee58c8e..201ee58c8e 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/init5282.c
+++ b/bsps/m68k/uC5282/start/init5282.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds b/bsps/m68k/uC5282/start/linkcmds
index a3b84294e3..a3b84294e3 100644
--- a/c/src/lib/libbsp/m68k/uC5282/startup/linkcmds
+++ b/bsps/m68k/uC5282/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/csb350/startup/bsp_specs b/bsps/mips/csb350/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/csb350/startup/bsp_specs
+++ b/bsps/mips/csb350/start/bsp_specs
diff --git a/c/src/lib/libbsp/mips/csb350/startup/bspreset.c b/bsps/mips/csb350/start/bspreset.c
index 811a6f96c7..811a6f96c7 100644
--- a/c/src/lib/libbsp/mips/csb350/startup/bspreset.c
+++ b/bsps/mips/csb350/start/bspreset.c
diff --git a/c/src/lib/libbsp/mips/csb350/startup/bspstart.c b/bsps/mips/csb350/start/bspstart.c
index 5b9a6aed82..5b9a6aed82 100644
--- a/c/src/lib/libbsp/mips/csb350/startup/bspstart.c
+++ b/bsps/mips/csb350/start/bspstart.c
diff --git a/c/src/lib/libbsp/mips/csb350/startup/linkcmds b/bsps/mips/csb350/start/linkcmds
index b11b73bf42..b11b73bf42 100644
--- a/c/src/lib/libbsp/mips/csb350/startup/linkcmds
+++ b/bsps/mips/csb350/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs b/bsps/mips/hurricane/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/hurricane/startup/bsp_specs
+++ b/bsps/mips/hurricane/start/bsp_specs
diff --git a/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c b/bsps/mips/hurricane/start/bspstart.c
index 8b36b58628..8b36b58628 100644
--- a/c/src/lib/libbsp/mips/hurricane/startup/bspstart.c
+++ b/bsps/mips/hurricane/start/bspstart.c
diff --git a/c/src/lib/libbsp/mips/hurricane/startup/ghlinkcmds b/bsps/mips/hurricane/start/ghlinkcmds
index 9b6c6dce87..9b6c6dce87 100644
--- a/c/src/lib/libbsp/mips/hurricane/startup/ghlinkcmds
+++ b/bsps/mips/hurricane/start/ghlinkcmds
diff --git a/c/src/lib/libbsp/mips/hurricane/startup/inittlb.c b/bsps/mips/hurricane/start/inittlb.c
index 800cf3d23c..800cf3d23c 100644
--- a/c/src/lib/libbsp/mips/hurricane/startup/inittlb.c
+++ b/bsps/mips/hurricane/start/inittlb.c
diff --git a/c/src/lib/libbsp/mips/hurricane/startup/linkcmds b/bsps/mips/hurricane/start/linkcmds
index 4e10c29f6e..4e10c29f6e 100644
--- a/c/src/lib/libbsp/mips/hurricane/startup/linkcmds
+++ b/bsps/mips/hurricane/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/hurricane/startup/usc.S b/bsps/mips/hurricane/start/usc.S
index 887290e2a9..887290e2a9 100644
--- a/c/src/lib/libbsp/mips/hurricane/startup/usc.S
+++ b/bsps/mips/hurricane/start/usc.S
diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/bsp_specs b/bsps/mips/jmr3904/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/jmr3904/startup/bsp_specs
+++ b/bsps/mips/jmr3904/start/bsp_specs
diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c b/bsps/mips/jmr3904/start/bspstart.c
index 829c8400d8..829c8400d8 100644
--- a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c
+++ b/bsps/mips/jmr3904/start/bspstart.c
diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/linkcmds b/bsps/mips/jmr3904/start/linkcmds
index 12a8a65b09..12a8a65b09 100644
--- a/c/src/lib/libbsp/mips/jmr3904/startup/linkcmds
+++ b/bsps/mips/jmr3904/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/malta/startup/bsp_specs b/bsps/mips/malta/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/malta/startup/bsp_specs
+++ b/bsps/mips/malta/start/bsp_specs
diff --git a/c/src/lib/libbsp/mips/malta/startup/bspreset.c b/bsps/mips/malta/start/bspreset.c
index 6d406ea943..6d406ea943 100644
--- a/c/src/lib/libbsp/mips/malta/startup/bspreset.c
+++ b/bsps/mips/malta/start/bspreset.c
diff --git a/c/src/lib/libbsp/mips/malta/startup/bspstart.c b/bsps/mips/malta/start/bspstart.c
index 58eee11027..58eee11027 100644
--- a/c/src/lib/libbsp/mips/malta/startup/bspstart.c
+++ b/bsps/mips/malta/start/bspstart.c
diff --git a/c/src/lib/libbsp/mips/malta/startup/inittlb.c b/bsps/mips/malta/start/inittlb.c
index 0088b98483..0088b98483 100644
--- a/c/src/lib/libbsp/mips/malta/startup/inittlb.c
+++ b/bsps/mips/malta/start/inittlb.c
diff --git a/c/src/lib/libbsp/mips/malta/startup/linkcmds b/bsps/mips/malta/start/linkcmds
index 3a71c5af8b..3a71c5af8b 100644
--- a/c/src/lib/libbsp/mips/malta/startup/linkcmds
+++ b/bsps/mips/malta/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/malta/startup/simple_access.c b/bsps/mips/malta/start/simple_access.c
index cd15484b1c..cd15484b1c 100644
--- a/c/src/lib/libbsp/mips/malta/startup/simple_access.c
+++ b/bsps/mips/malta/start/simple_access.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/bsp_specs b/bsps/mips/rbtx4925/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/startup/bsp_specs
+++ b/bsps/mips/rbtx4925/start/bsp_specs
diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c b/bsps/mips/rbtx4925/start/bspstart.c
index fc9fce1d94..fc9fce1d94 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/startup/bspstart.c
+++ b/bsps/mips/rbtx4925/start/bspstart.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/idttlb.S b/bsps/mips/rbtx4925/start/idttlb.S
index 2574027dc9..2574027dc9 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/startup/idttlb.S
+++ b/bsps/mips/rbtx4925/start/idttlb.S
diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c b/bsps/mips/rbtx4925/start/inittlb.c
index ab09e9c854..ab09e9c854 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/startup/inittlb.c
+++ b/bsps/mips/rbtx4925/start/inittlb.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/startup/linkcmds b/bsps/mips/rbtx4925/start/linkcmds
index 4f7de84115..4f7de84115 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/startup/linkcmds
+++ b/bsps/mips/rbtx4925/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/rbtx4938/startup/bsp_specs b/bsps/mips/rbtx4938/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/startup/bsp_specs
+++ b/bsps/mips/rbtx4938/start/bsp_specs
diff --git a/c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c b/bsps/mips/rbtx4938/start/bspstart.c
index 4c7ffb0ca3..4c7ffb0ca3 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/startup/bspstart.c
+++ b/bsps/mips/rbtx4938/start/bspstart.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/startup/inittlb.c b/bsps/mips/rbtx4938/start/inittlb.c
index ab09e9c854..ab09e9c854 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/startup/inittlb.c
+++ b/bsps/mips/rbtx4938/start/inittlb.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/startup/linkcmds b/bsps/mips/rbtx4938/start/linkcmds
index 246e11debc..246e11debc 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/startup/linkcmds
+++ b/bsps/mips/rbtx4938/start/linkcmds
diff --git a/c/src/lib/libbsp/mips/shared/startup/idtmem.S b/bsps/mips/shared/start/idtmem.S
index ed51e67362..ed51e67362 100644
--- a/c/src/lib/libbsp/mips/shared/startup/idtmem.S
+++ b/bsps/mips/shared/start/idtmem.S
diff --git a/c/src/lib/libbsp/mips/shared/startup/idttlb.S b/bsps/mips/shared/start/idttlb.S
index 2574027dc9..2574027dc9 100644
--- a/c/src/lib/libbsp/mips/shared/startup/idttlb.S
+++ b/bsps/mips/shared/start/idttlb.S
diff --git a/c/src/lib/libbsp/moxie/moxiesim/startup/bsp_specs b/bsps/moxie/moxiesim/start/bsp_specs
index afa9f6badb..afa9f6badb 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/startup/bsp_specs
+++ b/bsps/moxie/moxiesim/start/bsp_specs
diff --git a/c/src/lib/libbsp/moxie/moxiesim/startup/linkcmds b/bsps/moxie/moxiesim/start/linkcmds
index a4d9edac11..a4d9edac11 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/startup/linkcmds
+++ b/bsps/moxie/moxiesim/start/linkcmds
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs b/bsps/nios2/nios2_iss/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/startup/bsp_specs
+++ b/bsps/nios2/nios2_iss/start/bsp_specs
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c b/bsps/nios2/nios2_iss/start/bspstart.c
index c619e583ae..c619e583ae 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/startup/bspstart.c
+++ b/bsps/nios2/nios2_iss/start/bspstart.c
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds b/bsps/nios2/nios2_iss/start/linkcmds
index c08c37628a..c08c37628a 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds
+++ b/bsps/nios2/nios2_iss/start/linkcmds
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/main.c b/bsps/nios2/nios2_iss/start/main.c
index 651b425b7c..651b425b7c 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/startup/main.c
+++ b/bsps/nios2/nios2_iss/start/main.c
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c b/bsps/nios2/nios2_iss/start/setvec.c
index 4a3056aee3..4a3056aee3 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c
+++ b/bsps/nios2/nios2_iss/start/setvec.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bsp_specs b/bsps/no_cpu/no_bsp/start/bsp_specs
index 140802f2c0..140802f2c0 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bsp_specs
+++ b/bsps/no_cpu/no_bsp/start/bsp_specs
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c b/bsps/no_cpu/no_bsp/start/bspstart.c
index b77b971ca1..b77b971ca1 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/bspstart.c
+++ b/bsps/no_cpu/no_bsp/start/bspstart.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/linkcmds b/bsps/no_cpu/no_bsp/start/linkcmds
index 6f2fda7b41..6f2fda7b41 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/linkcmds
+++ b/bsps/no_cpu/no_bsp/start/linkcmds
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c b/bsps/no_cpu/no_bsp/start/setvec.c
index 270fa445ac..270fa445ac 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/startup/setvec.c
+++ b/bsps/no_cpu/no_bsp/start/setvec.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs b/bsps/or1k/generic_or1k/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/bsp_specs
+++ b/bsps/or1k/generic_or1k/start/bsp_specs
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c b/bsps/or1k/generic_or1k/start/bspstart.c
index 35a536ef0b..35a536ef0b 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/bspstart.c
+++ b/bsps/or1k/generic_or1k/start/bspstart.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/startup/linkcmds b/bsps/or1k/generic_or1k/start/linkcmds
index cef99d36d0..cef99d36d0 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/startup/linkcmds
+++ b/bsps/or1k/generic_or1k/start/linkcmds
diff --git a/c/src/lib/libbsp/or1k/shared/startup/linkcmds.base b/bsps/or1k/shared/start/linkcmds.base
index 442042a9be..442042a9be 100644
--- a/c/src/lib/libbsp/or1k/shared/startup/linkcmds.base
+++ b/bsps/or1k/shared/start/linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs b/bsps/powerpc/beatnik/start/bsp_specs
index 99ca0adb61..99ca0adb61 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/bsp_specs
+++ b/bsps/powerpc/beatnik/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c b/bsps/powerpc/beatnik/start/bspclean.c
index 251d47a46d..251d47a46d 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspclean.c
+++ b/bsps/powerpc/beatnik/start/bspclean.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspreset.c b/bsps/powerpc/beatnik/start/bspreset.c
index 68540847ee..68540847ee 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspreset.c
+++ b/bsps/powerpc/beatnik/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c b/bsps/powerpc/beatnik/start/bspstart.c
index c3f2c0ceda..c3f2c0ceda 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/bspstart.c
+++ b/bsps/powerpc/beatnik/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/i2c_init.c b/bsps/powerpc/beatnik/start/i2c_init.c
index bc5c5ead02..bc5c5ead02 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/i2c_init.c
+++ b/bsps/powerpc/beatnik/start/i2c_init.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/startup/linkcmds b/bsps/powerpc/beatnik/start/linkcmds
index b30fb91277..b30fb91277 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/startup/linkcmds
+++ b/bsps/powerpc/beatnik/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bestcomm.c b/bsps/powerpc/gen5200/start/bestcomm.c
index ef59adcfd8..ef59adcfd8 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bestcomm.c
+++ b/bsps/powerpc/gen5200/start/bestcomm.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs b/bsps/powerpc/gen5200/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bsp_specs
+++ b/bsps/powerpc/gen5200/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspreset.c b/bsps/powerpc/gen5200/start/bspreset.c
index 232ebfeac0..232ebfeac0 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspreset.c
+++ b/bsps/powerpc/gen5200/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c b/bsps/powerpc/gen5200/start/bspstart.c
index 209cc7738e..209cc7738e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/bspstart.c
+++ b/bsps/powerpc/gen5200/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c b/bsps/powerpc/gen5200/start/cpuinit.c
index 77787c4956..77787c4956 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
+++ b/bsps/powerpc/gen5200/start/cpuinit.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l b/bsps/powerpc/gen5200/start/linkcmds.brs5l
index 58407e5f56..58407e5f56 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs5l
+++ b/bsps/powerpc/gen5200/start/linkcmds.brs5l
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l b/bsps/powerpc/gen5200/start/linkcmds.brs6l
index ae80a72ad5..ae80a72ad5 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.brs6l
+++ b/bsps/powerpc/gen5200/start/linkcmds.brs6l
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2 b/bsps/powerpc/gen5200/start/linkcmds.dp2
index 4ad76d6fce..4ad76d6fce 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.dp2
+++ b/bsps/powerpc/gen5200/start/linkcmds.dp2
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.gen5200_base b/bsps/powerpc/gen5200/start/linkcmds.gen5200_base
index 1a92c7c9dd..1a92c7c9dd 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.gen5200_base
+++ b/bsps/powerpc/gen5200/start/linkcmds.gen5200_base
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube b/bsps/powerpc/gen5200/start/linkcmds.icecube
index c05d45a852..c05d45a852 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.icecube
+++ b/bsps/powerpc/gen5200/start/linkcmds.icecube
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825 b/bsps/powerpc/gen5200/start/linkcmds.pm520_cr825
index 49d596b577..49d596b577 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
+++ b/bsps/powerpc/gen5200/start/linkcmds.pm520_cr825
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30 b/bsps/powerpc/gen5200/start/linkcmds.pm520_ze30
index 49d596b577..49d596b577 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
+++ b/bsps/powerpc/gen5200/start/linkcmds.pm520_ze30
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/uboot_support.c b/bsps/powerpc/gen5200/start/uboot_support.c
index f373f558e7..f373f558e7 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/uboot_support.c
+++ b/bsps/powerpc/gen5200/start/uboot_support.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs b/bsps/powerpc/gen83xx/start/bsp_specs
index a37ec281c8..a37ec281c8 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bsp_specs
+++ b/bsps/powerpc/gen83xx/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspreset.c b/bsps/powerpc/gen83xx/start/bspreset.c
index ebaf9f129f..ebaf9f129f 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspreset.c
+++ b/bsps/powerpc/gen83xx/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bsprestart.c b/bsps/powerpc/gen83xx/start/bsprestart.c
index 4a2d298de0..4a2d298de0 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bsprestart.c
+++ b/bsps/powerpc/gen83xx/start/bsprestart.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c b/bsps/powerpc/gen83xx/start/bspstart.c
index cd729a8e17..cd729a8e17 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c
+++ b/bsps/powerpc/gen83xx/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c b/bsps/powerpc/gen83xx/start/cpuinit.c
index 1b0fd1efef..1b0fd1efef 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c
+++ b/bsps/powerpc/gen83xx/start/cpuinit.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds b/bsps/powerpc/gen83xx/start/linkcmds
index 094fdf51af..094fdf51af 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds
+++ b/bsps/powerpc/gen83xx/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.br_uid b/bsps/powerpc/gen83xx/start/linkcmds.br_uid
index 3d8c3a154a..3d8c3a154a 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.br_uid
+++ b/bsps/powerpc/gen83xx/start/linkcmds.br_uid
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.hsc_cm01 b/bsps/powerpc/gen83xx/start/linkcmds.hsc_cm01
index d5b4b1e145..d5b4b1e145 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.hsc_cm01
+++ b/bsps/powerpc/gen83xx/start/linkcmds.hsc_cm01
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8309som b/bsps/powerpc/gen83xx/start/linkcmds.mpc8309som
index d5b4b1e145..d5b4b1e145 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8309som
+++ b/bsps/powerpc/gen83xx/start/linkcmds.mpc8309som
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8313erdb b/bsps/powerpc/gen83xx/start/linkcmds.mpc8313erdb
index 717b3b4866..717b3b4866 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8313erdb
+++ b/bsps/powerpc/gen83xx/start/linkcmds.mpc8313erdb
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8349eamds b/bsps/powerpc/gen83xx/start/linkcmds.mpc8349eamds
index d5b4b1e145..d5b4b1e145 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc8349eamds
+++ b/bsps/powerpc/gen83xx/start/linkcmds.mpc8349eamds
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc83xx b/bsps/powerpc/gen83xx/start/linkcmds.mpc83xx
index 4ddbcd6f76..4ddbcd6f76 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/linkcmds.mpc83xx
+++ b/bsps/powerpc/gen83xx/start/linkcmds.mpc83xx
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/startup/uboot_support.c b/bsps/powerpc/gen83xx/start/uboot_support.c
index 295059889d..295059889d 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/startup/uboot_support.c
+++ b/bsps/powerpc/gen83xx/start/uboot_support.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs b/bsps/powerpc/haleakala/start/bsp_specs
index 5752caaca0..5752caaca0 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bsp_specs
+++ b/bsps/powerpc/haleakala/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c b/bsps/powerpc/haleakala/start/bspstart.c
index 18b45f33df..18b45f33df 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c
+++ b/bsps/powerpc/haleakala/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds b/bsps/powerpc/haleakala/start/linkcmds
index 8c06a5103b..8c06a5103b 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/startup/linkcmds
+++ b/bsps/powerpc/haleakala/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs b/bsps/powerpc/motorola_powerpc/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bsp_specs
+++ b/bsps/powerpc/motorola_powerpc/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bspreset.c b/bsps/powerpc/motorola_powerpc/start/bspreset.c
index 0931badae4..0931badae4 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/bspreset.c
+++ b/bsps/powerpc/motorola_powerpc/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds b/bsps/powerpc/motorola_powerpc/start/linkcmds
index ae44032d4f..ae44032d4f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/linkcmds
+++ b/bsps/powerpc/motorola_powerpc/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs b/bsps/powerpc/mpc55xxevb/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bsp_specs
+++ b/bsps/powerpc/mpc55xxevb/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspgetworkarea.c b/bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c
index e7d988cf87..e7d988cf87 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspgetworkarea.c
+++ b/bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspreset.c b/bsps/powerpc/mpc55xxevb/start/bspreset.c
index a99b3856d3..a99b3856d3 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspreset.c
+++ b/bsps/powerpc/mpc55xxevb/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c b/bsps/powerpc/mpc55xxevb/start/bspstart.c
index 9042fc3864..9042fc3864 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c
+++ b/bsps/powerpc/mpc55xxevb/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S b/bsps/powerpc/mpc55xxevb/start/exc-vector-base.S
index 9d9e79f351..9d9e79f351 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/exc-vector-base.S
+++ b/bsps/powerpc/mpc55xxevb/start/exc-vector-base.S
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/get-system-clock.c b/bsps/powerpc/mpc55xxevb/start/get-system-clock.c
index 42e2b38327..42e2b38327 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/get-system-clock.c
+++ b/bsps/powerpc/mpc55xxevb/start/get-system-clock.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/idle-thread.c b/bsps/powerpc/mpc55xxevb/start/idle-thread.c
index 45bea8e418..45bea8e418 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/idle-thread.c
+++ b/bsps/powerpc/mpc55xxevb/start/idle-thread.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds b/bsps/powerpc/mpc55xxevb/start/linkcmds
index 5c2161deba..5c2161deba 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.gwlcfm b/bsps/powerpc/mpc55xxevb/start/linkcmds.gwlcfm
index cabaac2201..cabaac2201 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.gwlcfm
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.gwlcfm
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5566evb
index 4f63fb0e0a..4f63fb0e0a 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5566evb
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb_spe b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5566evb_spe
index 9255b15076..9255b15076 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5566evb_spe
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5566evb_spe
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc55xx b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc55xx
index 2c4e1e3f7b..2c4e1e3f7b 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc55xx
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc55xx
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_dpu b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5643l_dpu
index 2f7d80716d..2f7d80716d 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_dpu
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5643l_dpu
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5643l_evb
index 1977c92d59..1977c92d59 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5643l_evb
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5668g b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5668g
index 6c8e5a64f1..6c8e5a64f1 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5668g
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5668g
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_ecu508 b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508
index 1e52a3c6c3..1e52a3c6c3 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_ecu508
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_ecu508_app b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508_app
index 4b94ac50c4..4b94ac50c4 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_ecu508_app
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508_app
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_ecu508_boot b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508_boot
index 6dc5a7fcb0..6dc5a7fcb0 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_ecu508_boot
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508_boot
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_rsm6 b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_rsm6
index c96f8b9078..c96f8b9078 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_rsm6
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_rsm6
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_rsm6_base b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_rsm6_base
index 8f6a403ca8..8f6a403ca8 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_rsm6_base
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_rsm6_base
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674fevb
index 3113fb20b7..3113fb20b7 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674fevb
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb_spe b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674fevb_spe
index eab0907009..eab0907009 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674fevb_spe
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674fevb_spe
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.phycore_mpc5554 b/bsps/powerpc/mpc55xxevb/start/linkcmds.phycore_mpc5554
index 77b8abc5e0..77b8abc5e0 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.phycore_mpc5554
+++ b/bsps/powerpc/mpc55xxevb/start/linkcmds.phycore_mpc5554
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/restart.c b/bsps/powerpc/mpc55xxevb/start/restart.c
index 495aa39a95..495aa39a95 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/restart.c
+++ b/bsps/powerpc/mpc55xxevb/start/restart.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c b/bsps/powerpc/mpc55xxevb/start/sd-card-init.c
index f6e0484122..f6e0484122 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/sd-card-init.c
+++ b/bsps/powerpc/mpc55xxevb/start/sd-card-init.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S b/bsps/powerpc/mpc55xxevb/start/start-cache.S
index c30de57fc6..c30de57fc6 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S
+++ b/bsps/powerpc/mpc55xxevb/start/start-cache.S
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c b/bsps/powerpc/mpc55xxevb/start/start-clock.c
index 85468d5cb0..85468d5cb0 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-clock.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c b/bsps/powerpc/mpc55xxevb/start/start-config-clock.c
index d820af3755..d820af3755 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-clock.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c
index 69f9b61a7d..69f9b61a7d 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs.c b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c
index d12d0fa059..d12d0fa059 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi.c b/bsps/powerpc/mpc55xxevb/start/start-config-ebi.c
index 1ce2b297d8..1ce2b297d8 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-ebi.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c b/bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c
index 84e638d55c..84e638d55c 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c b/bsps/powerpc/mpc55xxevb/start/start-config-mmu.c
index 7cf319edd3..7cf319edd3 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-mmu.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c b/bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c
index 8355e647ca..8355e647ca 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c b/bsps/powerpc/mpc55xxevb/start/start-early.c
index e1a0b3da09..e1a0b3da09 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-early.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S b/bsps/powerpc/mpc55xxevb/start/start-flash.S
index 9c87d38a83..9c87d38a83 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S
+++ b/bsps/powerpc/mpc55xxevb/start/start-flash.S
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-prologue.c b/bsps/powerpc/mpc55xxevb/start/start-prologue.c
index 872a96edfd..872a96edfd 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-prologue.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-prologue.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-watchdog.c b/bsps/powerpc/mpc55xxevb/start/start-watchdog.c
index 7cf36ef02f..7cf36ef02f 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-watchdog.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-watchdog.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs b/bsps/powerpc/mpc8260ads/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bsp_specs
+++ b/bsps/powerpc/mpc8260ads/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/bsps/powerpc/mpc8260ads/start/bspstart.c
index 44ec072775..44ec072775 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
+++ b/bsps/powerpc/mpc8260ads/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/cpuinit.c b/bsps/powerpc/mpc8260ads/start/cpuinit.c
index c56ec69362..c56ec69362 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/cpuinit.c
+++ b/bsps/powerpc/mpc8260ads/start/cpuinit.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds b/bsps/powerpc/mpc8260ads/start/linkcmds
index f3092b862d..f3092b862d 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds
+++ b/bsps/powerpc/mpc8260ads/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs b/bsps/powerpc/mvme3100/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bsp_specs
+++ b/bsps/powerpc/mvme3100/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c b/bsps/powerpc/mvme3100/start/bspstart.c
index 27b483332c..27b483332c 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
+++ b/bsps/powerpc/mvme3100/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/linkcmds b/bsps/powerpc/mvme3100/start/linkcmds
index b30fb91277..b30fb91277 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/linkcmds
+++ b/bsps/powerpc/mvme3100/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c b/bsps/powerpc/mvme3100/start/misc.c
index 3a15397480..3a15397480 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/misc.c
+++ b/bsps/powerpc/mvme3100/start/misc.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bootpstuff.c b/bsps/powerpc/mvme5500/start/bootpstuff.c
index 518a43cdc8..518a43cdc8 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bootpstuff.c
+++ b/bsps/powerpc/mvme5500/start/bootpstuff.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs b/bsps/powerpc/mvme5500/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bsp_specs
+++ b/bsps/powerpc/mvme5500/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c b/bsps/powerpc/mvme5500/start/bspclean.c
index bd332cc89c..bd332cc89c 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspclean.c
+++ b/bsps/powerpc/mvme5500/start/bspclean.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c b/bsps/powerpc/mvme5500/start/bspreset.c
index de15bc4972..de15bc4972 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspreset.c
+++ b/bsps/powerpc/mvme5500/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c b/bsps/powerpc/mvme5500/start/bspstart.c
index 279524eb8f..279524eb8f 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/bspstart.c
+++ b/bsps/powerpc/mvme5500/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/linkcmds b/bsps/powerpc/mvme5500/start/linkcmds
index 384b623474..384b623474 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/linkcmds
+++ b/bsps/powerpc/mvme5500/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/startup/pgtbl_activate.c b/bsps/powerpc/mvme5500/start/pgtbl_activate.c
index 79725c6a06..79725c6a06 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/startup/pgtbl_activate.c
+++ b/bsps/powerpc/mvme5500/start/pgtbl_activate.c
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bsp_specs b/bsps/powerpc/psim/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/bsp_specs
+++ b/bsps/powerpc/psim/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/bsps/powerpc/psim/start/bspstart.c
index 3a9809c022..3a9809c022 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
+++ b/bsps/powerpc/psim/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/device-tree b/bsps/powerpc/psim/start/device-tree
index bd2a2a56ef..bd2a2a56ef 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/device-tree
+++ b/bsps/powerpc/psim/start/device-tree
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/linkcmds b/bsps/powerpc/psim/start/linkcmds
index ba9319c91d..ba9319c91d 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/linkcmds
+++ b/bsps/powerpc/psim/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs b/bsps/powerpc/qemuppc/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/bsp_specs
+++ b/bsps/powerpc/qemuppc/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c b/bsps/powerpc/qemuppc/start/bspstart.c
index 94d7f4b84d..94d7f4b84d 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/bspstart.c
+++ b/bsps/powerpc/qemuppc/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c b/bsps/powerpc/qemuppc/start/cmain.c
index bf46d03177..bf46d03177 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/cmain.c
+++ b/bsps/powerpc/qemuppc/start/cmain.c
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds b/bsps/powerpc/qemuppc/start/linkcmds
index 3169ad2741..3169ad2741 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds
+++ b/bsps/powerpc/qemuppc/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs b/bsps/powerpc/qoriq/start/bsp_specs
index 001c45b3c4..001c45b3c4 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bsp_specs
+++ b/bsps/powerpc/qoriq/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bspreset.c b/bsps/powerpc/qoriq/start/bspreset.c
index 545aa28ee3..545aa28ee3 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bspreset.c
+++ b/bsps/powerpc/qoriq/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bsprestart.c b/bsps/powerpc/qoriq/start/bsprestart.c
index 36e751e50d..36e751e50d 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bsprestart.c
+++ b/bsps/powerpc/qoriq/start/bsprestart.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bspsmp.c b/bsps/powerpc/qoriq/start/bspsmp.c
index a2d9fbede5..a2d9fbede5 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bspsmp.c
+++ b/bsps/powerpc/qoriq/start/bspsmp.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c b/bsps/powerpc/qoriq/start/bspstart.c
index 7d9fa0d3c7..7d9fa0d3c7 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/bspstart.c
+++ b/bsps/powerpc/qoriq/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/epapr_hcalls.S b/bsps/powerpc/qoriq/start/epapr_hcalls.S
index b019e5d710..b019e5d710 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/epapr_hcalls.S
+++ b/bsps/powerpc/qoriq/start/epapr_hcalls.S
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/l1cache.S b/bsps/powerpc/qoriq/start/l1cache.S
index bee3d28123..bee3d28123 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/l1cache.S
+++ b/bsps/powerpc/qoriq/start/l1cache.S
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/l2cache.S b/bsps/powerpc/qoriq/start/l2cache.S
index 1c57659aa1..1c57659aa1 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/l2cache.S
+++ b/bsps/powerpc/qoriq/start/l2cache.S
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_0 b/bsps/powerpc/qoriq/start/linkcmds.qoriq_core_0
index 80ae3937bf..80ae3937bf 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_0
+++ b/bsps/powerpc/qoriq/start/linkcmds.qoriq_core_0
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_1 b/bsps/powerpc/qoriq/start/linkcmds.qoriq_core_1
index ecb601b9ef..ecb601b9ef 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_core_1
+++ b/bsps/powerpc/qoriq/start/linkcmds.qoriq_core_1
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e500 b/bsps/powerpc/qoriq/start/linkcmds.qoriq_e500
index b727aefaa8..b727aefaa8 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e500
+++ b/bsps/powerpc/qoriq/start/linkcmds.qoriq_e500
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e6500_32 b/bsps/powerpc/qoriq/start/linkcmds.qoriq_e6500_32
index 900147c163..900147c163 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e6500_32
+++ b/bsps/powerpc/qoriq/start/linkcmds.qoriq_e6500_32
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e6500_64 b/bsps/powerpc/qoriq/start/linkcmds.qoriq_e6500_64
index a4969756ec..a4969756ec 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/linkcmds.qoriq_e6500_64
+++ b/bsps/powerpc/qoriq/start/linkcmds.qoriq_e6500_64
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c b/bsps/powerpc/qoriq/start/mmu-config.c
index b59d9c7114..b59d9c7114 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c
+++ b/bsps/powerpc/qoriq/start/mmu-config.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-tlb1.S b/bsps/powerpc/qoriq/start/mmu-tlb1.S
index 2dd06e2ed8..2dd06e2ed8 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu-tlb1.S
+++ b/bsps/powerpc/qoriq/start/mmu-tlb1.S
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu.c b/bsps/powerpc/qoriq/start/mmu.c
index 2629c9f999..2629c9f999 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/mmu.c
+++ b/bsps/powerpc/qoriq/start/mmu.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/portal.c b/bsps/powerpc/qoriq/start/portal.c
index f20eaf4d28..f20eaf4d28 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/portal.c
+++ b/bsps/powerpc/qoriq/start/portal.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/restart.S b/bsps/powerpc/qoriq/start/restart.S
index 7dd9eb198d..7dd9eb198d 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/restart.S
+++ b/bsps/powerpc/qoriq/start/restart.S
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c b/bsps/powerpc/shared/start/bspgetworkarea.c
index 3c86905020..3c86905020 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c
+++ b/bsps/powerpc/shared/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspidle.c b/bsps/powerpc/shared/start/bspidle.c
index de37fa1ced..de37fa1ced 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspidle.c
+++ b/bsps/powerpc/shared/start/bspidle.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base b/bsps/powerpc/shared/start/linkcmds.base
index e0dfdcc914..e0dfdcc914 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base
+++ b/bsps/powerpc/shared/start/linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.share b/bsps/powerpc/shared/start/linkcmds.share
index 59f538e3a2..59f538e3a2 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/linkcmds.share
+++ b/bsps/powerpc/shared/start/linkcmds.share
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c b/bsps/powerpc/shared/start/pgtbl_activate.c
index 2455f1e06d..2455f1e06d 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_activate.c
+++ b/bsps/powerpc/shared/start/pgtbl_activate.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c b/bsps/powerpc/shared/start/pgtbl_setup.c
index 8a8407bd49..8a8407bd49 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/pgtbl_setup.c
+++ b/bsps/powerpc/shared/start/pgtbl_setup.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/ppc_idle.c b/bsps/powerpc/shared/start/ppc_idle.c
index 44ae87311c..44ae87311c 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/ppc_idle.c
+++ b/bsps/powerpc/shared/start/ppc_idle.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c b/bsps/powerpc/shared/start/probeMemEnd.c
index 73b85d4709..73b85d4709 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/probeMemEnd.c
+++ b/bsps/powerpc/shared/start/probeMemEnd.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c b/bsps/powerpc/shared/start/sbrk.c
index f17a1511e4..f17a1511e4 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c
+++ b/bsps/powerpc/shared/start/sbrk.c
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/zerobss.c b/bsps/powerpc/shared/start/zerobss.c
index b3ab1ad9d9..b3ab1ad9d9 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/zerobss.c
+++ b/bsps/powerpc/shared/start/zerobss.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs b/bsps/powerpc/ss555/start/bsp_specs
index 2625609327..2625609327 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/bsp_specs
+++ b/bsps/powerpc/ss555/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c b/bsps/powerpc/ss555/start/bspstart.c
index f47ca7d5be..f47ca7d5be 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c
+++ b/bsps/powerpc/ss555/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c b/bsps/powerpc/ss555/start/iss555.c
index 034ae74b1d..034ae74b1d 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/iss555.c
+++ b/bsps/powerpc/ss555/start/iss555.c
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/linkcmds b/bsps/powerpc/ss555/start/linkcmds
index 8282d6c605..8282d6c605 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/linkcmds
+++ b/bsps/powerpc/ss555/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c b/bsps/powerpc/ss555/start/tm27supp.c
index 4c1660ff70..4c1660ff70 100644
--- a/c/src/lib/libbsp/powerpc/ss555/startup/tm27supp.c
+++ b/bsps/powerpc/ss555/start/tm27supp.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs b/bsps/powerpc/t32mppc/start/bsp_specs
index f8bbffbdf6..f8bbffbdf6 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/startup/bsp_specs
+++ b/bsps/powerpc/t32mppc/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/startup/bspreset.c b/bsps/powerpc/t32mppc/start/bspreset.c
index 9472192fab..9472192fab 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/startup/bspreset.c
+++ b/bsps/powerpc/t32mppc/start/bspreset.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c b/bsps/powerpc/t32mppc/start/bspstart.c
index 5fc36b4019..5fc36b4019 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/startup/bspstart.c
+++ b/bsps/powerpc/t32mppc/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/startup/linkcmds.t32mppc b/bsps/powerpc/t32mppc/start/linkcmds.t32mppc
index 02367f57d0..02367f57d0 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/startup/linkcmds.t32mppc
+++ b/bsps/powerpc/t32mppc/start/linkcmds.t32mppc
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs b/bsps/powerpc/tqm8xx/start/bsp_specs
index b5cd6764ce..b5cd6764ce 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bsp_specs
+++ b/bsps/powerpc/tqm8xx/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspgetworkarea.c b/bsps/powerpc/tqm8xx/start/bspgetworkarea.c
index 4a0a4db534..4a0a4db534 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspgetworkarea.c
+++ b/bsps/powerpc/tqm8xx/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c b/bsps/powerpc/tqm8xx/start/bspstart.c
index df0581ce77..df0581ce77 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c
+++ b/bsps/powerpc/tqm8xx/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/cpuinit.c b/bsps/powerpc/tqm8xx/start/cpuinit.c
index 5d34e07cfb..5d34e07cfb 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/cpuinit.c
+++ b/bsps/powerpc/tqm8xx/start/cpuinit.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds b/bsps/powerpc/tqm8xx/start/linkcmds
index 7171d0230a..7171d0230a 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/linkcmds
+++ b/bsps/powerpc/tqm8xx/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/startup/mmutlbtab.c b/bsps/powerpc/tqm8xx/start/mmutlbtab.c
index 8b1ad90036..8b1ad90036 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/startup/mmutlbtab.c
+++ b/bsps/powerpc/tqm8xx/start/mmutlbtab.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs b/bsps/powerpc/virtex/start/bsp_specs
index 6cb546f392..6cb546f392 100644
--- a/c/src/lib/libbsp/powerpc/virtex/startup/bsp_specs
+++ b/bsps/powerpc/virtex/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c b/bsps/powerpc/virtex/start/bspstart.c
index 5b4a4a135f..5b4a4a135f 100644
--- a/c/src/lib/libbsp/powerpc/virtex/startup/bspstart.c
+++ b/bsps/powerpc/virtex/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/virtex/startup/linkcmds.in b/bsps/powerpc/virtex/start/linkcmds.in
index 13f9217e9d..13f9217e9d 100644
--- a/c/src/lib/libbsp/powerpc/virtex/startup/linkcmds.in
+++ b/bsps/powerpc/virtex/start/linkcmds.in
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs b/bsps/powerpc/virtex4/start/bsp_specs
index ccbea2690c..ccbea2690c 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/bsp_specs
+++ b/bsps/powerpc/virtex4/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c b/bsps/powerpc/virtex4/start/bspclean.c
index bd5829e0b2..bd5829e0b2 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/bspclean.c
+++ b/bsps/powerpc/virtex4/start/bspclean.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c b/bsps/powerpc/virtex4/start/bspstart.c
index d5c255be6d..d5c255be6d 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c
+++ b/bsps/powerpc/virtex4/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/dummy_console.c b/bsps/powerpc/virtex4/start/dummy_console.c
index 642fe45618..642fe45618 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/dummy_console.c
+++ b/bsps/powerpc/virtex4/start/dummy_console.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds b/bsps/powerpc/virtex4/start/linkcmds
index 50d3a3f13c..50d3a3f13c 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds
+++ b/bsps/powerpc/virtex4/start/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs b/bsps/powerpc/virtex5/start/bsp_specs
index ccbea2690c..ccbea2690c 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/bsp_specs
+++ b/bsps/powerpc/virtex5/start/bsp_specs
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c b/bsps/powerpc/virtex5/start/bspclean.c
index bd5829e0b2..bd5829e0b2 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/bspclean.c
+++ b/bsps/powerpc/virtex5/start/bspclean.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c b/bsps/powerpc/virtex5/start/bspstart.c
index ff821574a9..ff821574a9 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c
+++ b/bsps/powerpc/virtex5/start/bspstart.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c b/bsps/powerpc/virtex5/start/dummy_console.c
index 2cdab33c8c..2cdab33c8c 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/dummy_console.c
+++ b/bsps/powerpc/virtex5/start/dummy_console.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds b/bsps/powerpc/virtex5/start/linkcmds
index 9bd7c2e67f..9bd7c2e67f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds
+++ b/bsps/powerpc/virtex5/start/linkcmds
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_fatal_halt.c b/bsps/riscv/riscv_generic/start/bsp_fatal_halt.c
index 64c307990b..64c307990b 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_fatal_halt.c
+++ b/bsps/riscv/riscv_generic/start/bsp_fatal_halt.c
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_specs b/bsps/riscv/riscv_generic/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/startup/bsp_specs
+++ b/bsps/riscv/riscv_generic/start/bsp_specs
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/startup/linkcmds b/bsps/riscv/riscv_generic/start/linkcmds
index fad1d1e1d2..fad1d1e1d2 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/startup/linkcmds
+++ b/bsps/riscv/riscv_generic/start/linkcmds
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs b/bsps/sh/gensh1/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/bsp_specs
+++ b/bsps/sh/gensh1/start/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/cpu_asm.c b/bsps/sh/gensh1/start/cpu_asm.c
index 99d9cc9a6a..99d9cc9a6a 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/cpu_asm.c
+++ b/bsps/sh/gensh1/start/cpu_asm.c
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/ispsh7032.c b/bsps/sh/gensh1/start/ispsh7032.c
index 05ba2f1e90..05ba2f1e90 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/ispsh7032.c
+++ b/bsps/sh/gensh1/start/ispsh7032.c
diff --git a/c/src/lib/libbsp/sh/gensh1/startup/linkcmds b/bsps/sh/gensh1/start/linkcmds
index d268d4cfc7..d268d4cfc7 100644
--- a/c/src/lib/libbsp/sh/gensh1/startup/linkcmds
+++ b/bsps/sh/gensh1/start/linkcmds
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs b/bsps/sh/gensh2/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/bsp_specs
+++ b/bsps/sh/gensh2/start/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c b/bsps/sh/gensh2/start/cpu_asm.c
index 47bc859dbd..47bc859dbd 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c
+++ b/bsps/sh/gensh2/start/cpu_asm.c
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/hw_init.c b/bsps/sh/gensh2/start/hw_init.c
index f3cbb54ecf..f3cbb54ecf 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/hw_init.c
+++ b/bsps/sh/gensh2/start/hw_init.c
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c b/bsps/sh/gensh2/start/ispsh7045.c
index 4e6dabed3f..4e6dabed3f 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c
+++ b/bsps/sh/gensh2/start/ispsh7045.c
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds b/bsps/sh/gensh2/start/linkcmds
index 2c4d44a941..2c4d44a941 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds
+++ b/bsps/sh/gensh2/start/linkcmds
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram b/bsps/sh/gensh2/start/linkcmds.ram
index c5349398ff..c5349398ff 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.ram
+++ b/bsps/sh/gensh2/start/linkcmds.ram
diff --git a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom b/bsps/sh/gensh2/start/linkcmds.rom
index 4934c10269..4934c10269 100644
--- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds.rom
+++ b/bsps/sh/gensh2/start/linkcmds.rom
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs b/bsps/sh/gensh4/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/bsp_specs
+++ b/bsps/sh/gensh4/start/bsp_specs
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/cpu_asm.c b/bsps/sh/gensh4/start/cpu_asm.c
index 52a033bb75..52a033bb75 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/cpu_asm.c
+++ b/bsps/sh/gensh4/start/cpu_asm.c
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/ispsh7750.c b/bsps/sh/gensh4/start/ispsh7750.c
index 5a1282f583..5a1282f583 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/ispsh7750.c
+++ b/bsps/sh/gensh4/start/ispsh7750.c
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds b/bsps/sh/gensh4/start/linkcmds
index de6bb05693..de6bb05693 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds
+++ b/bsps/sh/gensh4/start/linkcmds
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom b/bsps/sh/gensh4/start/linkcmds.rom
index 13c6096af1..13c6096af1 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom
+++ b/bsps/sh/gensh4/start/linkcmds.rom
diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram b/bsps/sh/gensh4/start/linkcmds.rom2ram
index cc14d4e98d..cc14d4e98d 100644
--- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram
+++ b/bsps/sh/gensh4/start/linkcmds.rom2ram
diff --git a/c/src/lib/libbsp/sh/shared/startup/bspstart.c b/bsps/sh/shared/start/bspstart.c
index 57b2c9e1ef..57b2c9e1ef 100644
--- a/c/src/lib/libbsp/sh/shared/startup/bspstart.c
+++ b/bsps/sh/shared/start/bspstart.c
diff --git a/c/src/lib/libbsp/sh/shsim/startup/bsp_specs b/bsps/sh/shsim/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/bsp_specs
+++ b/bsps/sh/shsim/start/bsp_specs
diff --git a/c/src/lib/libbsp/sh/shsim/startup/cpu_asm.c b/bsps/sh/shsim/start/cpu_asm.c
index 2ca8926a24..2ca8926a24 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/cpu_asm.c
+++ b/bsps/sh/shsim/start/cpu_asm.c
diff --git a/c/src/lib/libbsp/sh/shsim/startup/ispshgdb.c b/bsps/sh/shsim/start/ispshgdb.c
index 09843172d9..09843172d9 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/ispshgdb.c
+++ b/bsps/sh/shsim/start/ispshgdb.c
diff --git a/c/src/lib/libbsp/sh/shsim/startup/linkcmds b/bsps/sh/shsim/start/linkcmds
index 41c7245da0..41c7245da0 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/linkcmds
+++ b/bsps/sh/shsim/start/linkcmds
diff --git a/c/src/lib/libbsp/sh/shsim/startup/sysexit.c b/bsps/sh/shsim/start/sysexit.c
index dde20f35e8..dde20f35e8 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/sysexit.c
+++ b/bsps/sh/shsim/start/sysexit.c
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/boardinit.S b/bsps/sparc/erc32/start/boardinit.S
index 9ced1c3639..9ced1c3639 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/boardinit.S
+++ b/bsps/sparc/erc32/start/boardinit.S
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs b/bsps/sparc/erc32/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bsp_specs
+++ b/bsps/sparc/erc32/start/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c b/bsps/sparc/erc32/start/bspdelay.c
index afd42cbd6f..afd42cbd6f 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bspdelay.c
+++ b/bsps/sparc/erc32/start/bspdelay.c
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bspidle.c b/bsps/sparc/erc32/start/bspidle.c
index 4b41625e84..4b41625e84 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bspidle.c
+++ b/bsps/sparc/erc32/start/bspidle.c
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/erc32mec.c b/bsps/sparc/erc32/start/erc32mec.c
index 7b0ccbd309..7b0ccbd309 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/erc32mec.c
+++ b/bsps/sparc/erc32/start/erc32mec.c
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds b/bsps/sparc/erc32/start/linkcmds
index 9df3a0d94f..9df3a0d94f 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
+++ b/bsps/sparc/erc32/start/linkcmds
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/setvec.c b/bsps/sparc/erc32/start/setvec.c
index d3aa8ed72f..d3aa8ed72f 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/setvec.c
+++ b/bsps/sparc/erc32/start/setvec.c
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/spurious.c b/bsps/sparc/erc32/start/spurious.c
index b022f96f5c..b022f96f5c 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/spurious.c
+++ b/bsps/sparc/erc32/start/spurious.c
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs b/bsps/sparc/leon2/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/bsp_specs
+++ b/bsps/sparc/leon2/start/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bspdelay.c b/bsps/sparc/leon2/start/bspdelay.c
index 5ee8123157..5ee8123157 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/bspdelay.c
+++ b/bsps/sparc/leon2/start/bspdelay.c
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bspidle.c b/bsps/sparc/leon2/start/bspidle.c
index 8f11f66fb1..8f11f66fb1 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/bspidle.c
+++ b/bsps/sparc/leon2/start/bspidle.c
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/bspstart.c b/bsps/sparc/leon2/start/bspstart.c
index f2ed8ae16c..f2ed8ae16c 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/bspstart.c
+++ b/bsps/sparc/leon2/start/bspstart.c
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/linkcmds b/bsps/sparc/leon2/start/linkcmds
index f1c7b9ce3e..f1c7b9ce3e 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/linkcmds
+++ b/bsps/sparc/leon2/start/linkcmds
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/linkcmds.at697f b/bsps/sparc/leon2/start/linkcmds.at697f
index 36e6ec49cb..36e6ec49cb 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/linkcmds.at697f
+++ b/bsps/sparc/leon2/start/linkcmds.at697f
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/linkcmds.leon2 b/bsps/sparc/leon2/start/linkcmds.leon2
index f1c7b9ce3e..f1c7b9ce3e 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/linkcmds.leon2
+++ b/bsps/sparc/leon2/start/linkcmds.leon2
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/setvec.c b/bsps/sparc/leon2/start/setvec.c
index e2d839c2e4..e2d839c2e4 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/setvec.c
+++ b/bsps/sparc/leon2/start/setvec.c
diff --git a/c/src/lib/libbsp/sparc/leon2/startup/spurious.c b/bsps/sparc/leon2/start/spurious.c
index 971c3cd44b..971c3cd44b 100644
--- a/c/src/lib/libbsp/sparc/leon2/startup/spurious.c
+++ b/bsps/sparc/leon2/start/spurious.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bsp_fatal_halt.c b/bsps/sparc/leon3/start/bsp_fatal_halt.c
index fa907a3363..fa907a3363 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bsp_fatal_halt.c
+++ b/bsps/sparc/leon3/start/bsp_fatal_halt.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs b/bsps/sparc/leon3/start/bsp_specs
index 87638cc027..87638cc027 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bsp_specs
+++ b/bsps/sparc/leon3/start/bsp_specs
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspclean.c b/bsps/sparc/leon3/start/bspclean.c
index eff9c8635b..eff9c8635b 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspclean.c
+++ b/bsps/sparc/leon3/start/bspclean.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspdelay.c b/bsps/sparc/leon3/start/bspdelay.c
index 938a8bdccb..938a8bdccb 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspdelay.c
+++ b/bsps/sparc/leon3/start/bspdelay.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspidle.S b/bsps/sparc/leon3/start/bspidle.S
index 8557ff42a1..8557ff42a1 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspidle.S
+++ b/bsps/sparc/leon3/start/bspidle.S
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c b/bsps/sparc/leon3/start/bspsmp.c
index 280788fa1c..280788fa1c 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c
+++ b/bsps/sparc/leon3/start/bspsmp.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c b/bsps/sparc/leon3/start/bspstart.c
index 58fc7d0907..58fc7d0907 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspstart.c
+++ b/bsps/sparc/leon3/start/bspstart.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c b/bsps/sparc/leon3/start/cpucounter.c
index 87554ce550..87554ce550 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/cpucounter.c
+++ b/bsps/sparc/leon3/start/cpucounter.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/eirq.c b/bsps/sparc/leon3/start/eirq.c
index 1f7be1ba74..1f7be1ba74 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/eirq.c
+++ b/bsps/sparc/leon3/start/eirq.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.gr712rc b/bsps/sparc/leon3/start/linkcmds.gr712rc
index 6954e88f45..6954e88f45 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.gr712rc
+++ b/bsps/sparc/leon3/start/linkcmds.gr712rc
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.gr740 b/bsps/sparc/leon3/start/linkcmds.gr740
index c16fd7fd7f..c16fd7fd7f 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.gr740
+++ b/bsps/sparc/leon3/start/linkcmds.gr740
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3 b/bsps/sparc/leon3/start/linkcmds.leon3
index 6954e88f45..6954e88f45 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3
+++ b/bsps/sparc/leon3/start/linkcmds.leon3
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.ut699 b/bsps/sparc/leon3/start/linkcmds.ut699
index 6954e88f45..6954e88f45 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.ut699
+++ b/bsps/sparc/leon3/start/linkcmds.ut699
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.ut700 b/bsps/sparc/leon3/start/linkcmds.ut700
index 6954e88f45..6954e88f45 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.ut700
+++ b/bsps/sparc/leon3/start/linkcmds.ut700
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/setvec.c b/bsps/sparc/leon3/start/setvec.c
index 5b5888d51a..5b5888d51a 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/setvec.c
+++ b/bsps/sparc/leon3/start/setvec.c
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c b/bsps/sparc/leon3/start/spurious.c
index 23ac4bf4cf..23ac4bf4cf 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/spurious.c
+++ b/bsps/sparc/leon3/start/spurious.c
diff --git a/c/src/lib/libbsp/sparc/shared/startup/bsp_fatal_exit.c b/bsps/sparc/shared/start/bsp_fatal_exit.c
index 8b64125c93..8b64125c93 100644
--- a/c/src/lib/libbsp/sparc/shared/startup/bsp_fatal_exit.c
+++ b/bsps/sparc/shared/start/bsp_fatal_exit.c
diff --git a/c/src/lib/libbsp/sparc/shared/startup/bsp_fatal_halt.c b/bsps/sparc/shared/start/bsp_fatal_halt.c
index f32ddaafc0..f32ddaafc0 100644
--- a/c/src/lib/libbsp/sparc/shared/startup/bsp_fatal_halt.c
+++ b/bsps/sparc/shared/start/bsp_fatal_halt.c
diff --git a/c/src/lib/libbsp/sparc/shared/startup/bspgetworkarea.c b/bsps/sparc/shared/start/bspgetworkarea.c
index b05113d9eb..b05113d9eb 100644
--- a/c/src/lib/libbsp/sparc/shared/startup/bspgetworkarea.c
+++ b/bsps/sparc/shared/start/bspgetworkarea.c
diff --git a/c/src/lib/libbsp/sparc/shared/startup/linkcmds.base b/bsps/sparc/shared/start/linkcmds.base
index 4c7750dfe0..4c7750dfe0 100644
--- a/c/src/lib/libbsp/sparc/shared/startup/linkcmds.base
+++ b/bsps/sparc/shared/start/linkcmds.base
diff --git a/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs b/bsps/sparc64/niagara/start/bsp_specs
index 0b4b0db932..0b4b0db932 100644
--- a/c/src/lib/libbsp/sparc64/niagara/startup/bsp_specs
+++ b/bsps/sparc64/niagara/start/bsp_specs
diff --git a/c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c b/bsps/sparc64/niagara/start/bspclean.c
index eacc264e5b..eacc264e5b 100644
--- a/c/src/lib/libbsp/sparc64/niagara/startup/bspclean.c
+++ b/bsps/sparc64/niagara/start/bspclean.c
diff --git a/c/src/lib/libbsp/sparc64/niagara/startup/m5op.h b/bsps/sparc64/niagara/start/m5op.h
index d349e4d6bc..d349e4d6bc 100644
--- a/c/src/lib/libbsp/sparc64/niagara/startup/m5op.h
+++ b/bsps/sparc64/niagara/start/m5op.h
diff --git a/c/src/lib/libbsp/sparc64/niagara/startup/m5op_sparc.S b/bsps/sparc64/niagara/start/m5op_sparc.S
index 40248ff8bf..40248ff8bf 100644
--- a/c/src/lib/libbsp/sparc64/niagara/startup/m5op_sparc.S
+++ b/bsps/sparc64/niagara/start/m5op_sparc.S
diff --git a/c/src/lib/libbsp/sparc64/niagara/startup/m5ops.h b/bsps/sparc64/niagara/start/m5ops.h
index 8ff1ac42f1..8ff1ac42f1 100644
--- a/c/src/lib/libbsp/sparc64/niagara/startup/m5ops.h
+++ b/bsps/sparc64/niagara/start/m5ops.h
diff --git a/c/src/lib/libbsp/sparc64/shared/startup/linkcmds b/bsps/sparc64/shared/start/linkcmds
index 2f9db3a087..2f9db3a087 100644
--- a/c/src/lib/libbsp/sparc64/shared/startup/linkcmds
+++ b/bsps/sparc64/shared/start/linkcmds
diff --git a/c/src/lib/libbsp/sparc64/shared/startup/setvec.c b/bsps/sparc64/shared/start/setvec.c
index 12c7713285..12c7713285 100644
--- a/c/src/lib/libbsp/sparc64/shared/startup/setvec.c
+++ b/bsps/sparc64/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs b/bsps/sparc64/usiii/start/bsp_specs
index 0b4b0db932..0b4b0db932 100644
--- a/c/src/lib/libbsp/sparc64/usiii/startup/bsp_specs
+++ b/bsps/sparc64/usiii/start/bsp_specs
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/startup/bsp_specs b/bsps/v850/gdbv850sim/start/bsp_specs
index 13be8e3f41..13be8e3f41 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/startup/bsp_specs
+++ b/bsps/v850/gdbv850sim/start/bsp_specs
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/startup/bspreset.c b/bsps/v850/gdbv850sim/start/bspreset.c
index b2986f4a24..b2986f4a24 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/startup/bspreset.c
+++ b/bsps/v850/gdbv850sim/start/bspreset.c
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds b/bsps/v850/gdbv850sim/start/linkcmds
index 42dccab5ae..42dccab5ae 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds
+++ b/bsps/v850/gdbv850sim/start/linkcmds
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/startup/trap.S b/bsps/v850/gdbv850sim/start/trap.S
index b6003b216d..b6003b216d 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/startup/trap.S
+++ b/bsps/v850/gdbv850sim/start/trap.S
diff --git a/c/src/aclocal/bsp-linkcmds.m4 b/c/src/aclocal/bsp-linkcmds.m4
index 3e40638f88..ce7b72d186 100644
--- a/c/src/aclocal/bsp-linkcmds.m4
+++ b/c/src/aclocal/bsp-linkcmds.m4
@@ -1,9 +1,10 @@
 dnl Install a BSP's linkcmds from the source-tree into the build-tree
 AC_DEFUN([RTEMS_BSP_LINKCMDS],[
+AC_REQUIRE([RTEMS_CANONICAL_TARGET_CPU])
 LINKCMDS=
-for f in "${srcdir}/startup/linkcmds.${RTEMS_BSP}" \
-  "${srcdir}/startup/linkcmds.${RTEMS_BSP_FAMILY}" \
-  "${srcdir}/startup/linkcmds";
+for f in "${srcdir}/../../../../../../bsps/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/start/linkcmds.${RTEMS_BSP}" \
+  "${srcdir}/../../../../../../bsps/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/start/linkcmds.${RTEMS_BSP_FAMILY}" \
+  "${srcdir}/../../../../../../bsps/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}/start/linkcmds";
 do
   AS_IF([test -f "$f"],[
     LINKCMDS="$f"
diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4
index ec33bc9bcf..54f3a086ce 100644
--- a/c/src/aclocal/prog-cc.m4
+++ b/c/src/aclocal/prog-cc.m4
@@ -29,7 +29,7 @@ dnl check if the compiler supports --specs
 RTEMS_GCC_SPECS
 
 AS_IF([test x"$rtems_cv_gcc_specs" = xyes],[
-GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/"
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/start"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am
index a3ba0e1134..af842ee3ef 100644
--- a/c/src/lib/libbsp/arm/Makefile.am
+++ b/c/src/lib/libbsp/arm/Makefile.am
@@ -5,9 +5,9 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## added but it is present in the source tree.
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-dist_project_lib_DATA = shared/startup/linkcmds.base
-dist_project_lib_DATA += shared/startup/linkcmds.armv4
-dist_project_lib_DATA += shared/startup/linkcmds.armv7m
+dist_project_lib_DATA = ../../../../../bsps/arm/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../bsps/arm/shared/start/linkcmds.armv4
+dist_project_lib_DATA += ../../../../../bsps/arm/shared/start/linkcmds.armv7m
 
 
 # comm
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index b8843af4da..99cf47db5e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/altera-cyclone-v/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -38,9 +38,9 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.altcycv
-dist_project_lib_DATA += startup/linkcmds.altcycv_devkit
-dist_project_lib_DATA += startup/linkcmds.altcycv_devkit_smp
+dist_project_lib_DATA += ../../../../../../bsps/arm/altera-cyclone-v/start/linkcmds.altcycv
+dist_project_lib_DATA += ../../../../../../bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit
+dist_project_lib_DATA += ../../../../../../bsps/arm/altera-cyclone-v/start/linkcmds.altcycv_devkit_smp
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -85,20 +85,20 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-fdt.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
-librtemsbsp_a_SOURCES += startup/mmu-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/mmu-config.c
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-smp.c
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/start/bspsmp.c
 endif
 
 # IRQ
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index e5e55bd510..20c9cffcda 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -7,7 +7,7 @@ include $(top_srcdir)/../../bsp.am
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/atsam/start/bsp_specs
 
 start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
@@ -15,9 +15,9 @@ project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
 project_lib_DATA += linkcmds.memory
-dist_project_lib_DATA += startup/linkcmds.intsram
-dist_project_lib_DATA += startup/linkcmds.sdram
-dist_project_lib_DATA += startup/linkcmds.qspiflash
+dist_project_lib_DATA += ../../../../../../bsps/arm/atsam/start/linkcmds.intsram
+dist_project_lib_DATA += ../../../../../../bsps/arm/atsam/start/linkcmds.sdram
+dist_project_lib_DATA += ../../../../../../bsps/arm/atsam/start/linkcmds.qspiflash
 
 ###############################################################################
 #                  Header                                                     #
@@ -91,21 +91,19 @@ librtemsbsp_a_SOURCES += libraries/libboard/source/board_memories.c
 librtemsbsp_a_SOURCES += libraries/libboard/source/dbg_console.c
 
 # Startup
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c
 librtemsbsp_a_SOURCES += ../shared/armv7m/startup/armv7m-cpucounter.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
-librtemsbsp_a_SOURCES += startup/getentropy-trng.c
-librtemsbsp_a_SOURCES += startup/pin-config.c
-librtemsbsp_a_SOURCES += startup/pmc-config.c
-librtemsbsp_a_SOURCES += startup/power-clock.c
-librtemsbsp_a_SOURCES += startup/power-rtc.c
-librtemsbsp_a_SOURCES += startup/power.c
-librtemsbsp_a_SOURCES += startup/power-rtc.c
-librtemsbsp_a_SOURCES += startup/power-clock.c
-librtemsbsp_a_SOURCES += startup/restart.c
-librtemsbsp_a_SOURCES += startup/sdram-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/getentropy-trng.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/pin-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/pmc-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/power-clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/power-rtc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/power.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/restart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/sdram-config.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/arm/atsam/configure.ac b/c/src/lib/libbsp/arm/atsam/configure.ac
index b9a8917e81..ddf945ac1b 100644
--- a/c/src/lib/libbsp/arm/atsam/configure.ac
+++ b/c/src/lib/libbsp/arm/atsam/configure.ac
@@ -65,7 +65,7 @@ RTEMS_BSPOPTS_HELP([BOARD_MAINOSC],[Main oscillator frequency in Hz (default 12M
 RTEMS_BSPOPTS_SET([ATSAM_MCK],[*],[123000000])
 RTEMS_BSPOPTS_HELP([ATSAM_MCK],
 [Frequency of the MCK in Hz. Set to 0 to force application defined speed.
-See startup/pmc-config.c for available clock configurations.])
+See start/pmc-config.c for available clock configurations.])
 
 RTEMS_BSPOPTS_SET([ATSAM_SLOWCLOCK_USE_XTAL],[*],[1])
 RTEMS_BSPOPTS_HELP([ATSAM_SLOWCLOCK_USE_XTAL],
@@ -107,6 +107,6 @@ ATSAM_LINKCMD([ATSAM_MEMORY_NOCACHE_SIZE],[size of NOCACHE section in bytes],[0x
 
 AC_CONFIG_FILES([
 Makefile
-linkcmds.memory:startup/linkcmds.memory.in
+linkcmds.memory:../../../../../../bsps/arm/atsam/start/linkcmds.memory.in
 ])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index a73f8ff9f8..9da9278220 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/beagle/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -25,7 +25,7 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.beagle
+dist_project_lib_DATA += ../../../../../../bsps/arm/beagle/start/linkcmds.beagle
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -47,15 +47,15 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/gpio/gpio-support.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
-librtemsbsp_a_SOURCES += startup/bspstartmmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/start/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/start/bspstartmmu.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 16184ed159..58bab61c7f 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/csb336/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -12,17 +12,17 @@ start.$(OBJEXT): ../../../../../../bsps/arm/csb336/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += ../../../../../../bsps/arm/csb336/start/linkcmds
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/memmap.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb336/start/memmap.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 2bb369baee..c837aef45a 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/csb337/start/bsp_specs
 
 if ENABLE_LCD
 endif
@@ -19,8 +19,8 @@ start.$(OBJEXT): ../../../../../../bsps/arm/csb337/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.csb337
-dist_project_lib_DATA += startup/linkcmds.csb637
+dist_project_lib_DATA += ../../../../../../bsps/arm/csb337/start/linkcmds.csb337
+dist_project_lib_DATA += ../../../../../../bsps/arm/csb337/start/linkcmds.csb637
 
 
 project_lib_LIBRARIES = librtemsbsp.a
@@ -28,15 +28,15 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/memmap.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/start/memmap.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
-librtemsbsp_a_SOURCES += startup/pmc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/start/pmc.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/csb337/clock/clock.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
@@ -58,7 +58,7 @@ if ENABLE_UMON
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/monlib.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/tfsDriver.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/umonrtemsglue.c
-librtemsbsp_a_SOURCES += startup/umonsupp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/start/umonsupp.c
 endif
 if ENABLE_UMON_CONSOLE
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/csb337/umon/umoncons.c
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 3d6385d5fa..ce0e11324a 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/edb7312/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -18,11 +18,11 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/edb7312/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 
diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
index ab88e3c405..cefe752a62 100644
--- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
+++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/gdbarmsim/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -21,10 +21,10 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/syscalls.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/start/syscalls.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 # console
@@ -35,8 +35,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 # timer
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 # start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gdbarmsim/start/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 
 # IRQ
 librtemsbsp_a_SOURCES += irq/irq.c
diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index ffb456b833..4f36cded13 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/gumstix/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -21,9 +21,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/memmap.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/gumstix/start/memmap.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/arm/gumstix/clock/clock.c
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 0dc1b30f96..b1dd9067ef 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/imx/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -18,7 +18,7 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.imx7
+dist_project_lib_DATA += ../../../../../../bsps/arm/imx/start/linkcmds.imx7
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -37,18 +37,18 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-fdt.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/ccm.c
-librtemsbsp_a_SOURCES += startup/imx_iomux.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/ccm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/imx_iomux.c
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-smp.c
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspsmp.c
 endif
 
 # IRQ
@@ -72,7 +72,7 @@ librtemsbsp_a_SOURCES += i2c/imx-i2c.c
 librtemsbsp_a_SOURCES += spi/imx-ecspi.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspstarthooks.c
 
 ###############################################################################
 #                  Special Rules                                              #
diff --git a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
index dc4b7bb30c..10ce313f81 100644
--- a/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lm3s69xx/Makefile.am
@@ -7,16 +7,16 @@ include $(top_srcdir)/../../bsp.am
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/lm3s69xx/start/bsp_specs
 
 start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.lm3s3749
-dist_project_lib_DATA += startup/linkcmds.lm3s6965
-dist_project_lib_DATA += startup/linkcmds.lm3s6965_qemu
+dist_project_lib_DATA += ../../../../../../bsps/arm/lm3s69xx/start/linkcmds.lm3s3749
+dist_project_lib_DATA += ../../../../../../bsps/arm/lm3s69xx/start/linkcmds.lm3s6965
+dist_project_lib_DATA += ../../../../../../bsps/arm/lm3s69xx/start/linkcmds.lm3s6965_qemu
 
 ###############################################################################
 #                  Header                                                     #
@@ -40,12 +40,12 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 
 # Startup
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspstarthook.c
-librtemsbsp_a_SOURCES += startup/io.c
-librtemsbsp_a_SOURCES += startup/syscon.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/bspstarthook.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lm3s69xx/start/syscon.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 1632cb879e..6597630f80 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/lpc176x/start/bsp_specs
 
 
 # ----------------------------
@@ -27,9 +27,9 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed
-dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed_ahb_ram
-dist_project_lib_DATA += startup/linkcmds.lpc1768_mbed_ahb_ram_eth
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed_ahb_ram
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc176x/start/linkcmds.lpc1768_mbed_ahb_ram_eth
 
 # ----------------------------
 # ------  LibBSP
@@ -48,9 +48,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-char.c
 
 # Startup
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/start/bspstart.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
@@ -104,7 +104,7 @@ librtemsbsp_a_SOURCES += watchdog/watchdog.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/start/bspstarthooks.c
 
 
 # ----------------------------
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 4ad4ac30fc..1e23b284cb 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/lpc24xx/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -25,20 +25,20 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.lpc17xx_ea_ram
-dist_project_lib_DATA += startup/linkcmds.lpc17xx_ea_rom_int
-dist_project_lib_DATA += startup/linkcmds.lpc17xx_plx800_ram
-dist_project_lib_DATA += startup/linkcmds.lpc17xx_plx800_rom_int
-dist_project_lib_DATA += startup/linkcmds.lpc2362
-dist_project_lib_DATA += startup/linkcmds.lpc23xx_tli800
-dist_project_lib_DATA += startup/linkcmds.lpc24xx_ea
-dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_ram
-dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_ext
-dist_project_lib_DATA += startup/linkcmds.lpc24xx_ncs_rom_int
-dist_project_lib_DATA += startup/linkcmds.lpc24xx_plx800_ram
-dist_project_lib_DATA += startup/linkcmds.lpc24xx_plx800_rom_int
-dist_project_lib_DATA += startup/linkcmds.lpc40xx_ea_ram
-dist_project_lib_DATA += startup/linkcmds.lpc40xx_ea_rom_int
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc17xx_ea_ram
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc17xx_ea_rom_int
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc17xx_plx800_ram
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc17xx_plx800_rom_int
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc2362
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc23xx_tli800
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ea
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_ram
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_rom_ext
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc24xx_ncs_rom_int
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc24xx_plx800_ram
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc24xx_plx800_rom_int
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc40xx_ea_ram
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc24xx/start/linkcmds.lpc40xx_ea_rom_int
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -58,10 +58,10 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-ch
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 
 # Startup
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/armv7m/startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspreset-armv4.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspreset-armv4.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspstart.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
@@ -105,17 +105,17 @@ librtemsbsp_a_SOURCES += i2c/i2c-config.c
 
 # Framebuffer
 librtemsbsp_a_SOURCES += ../shared/arm-pl111-fb.c
-librtemsbsp_a_SOURCES += startup/fb-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/fb-config.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
-librtemsbsp_a_SOURCES += startup/start-config-emc-dynamic.c
-librtemsbsp_a_SOURCES += startup/start-config-emc-static.c
-librtemsbsp_a_SOURCES += startup/start-config-mpu.c
-librtemsbsp_a_SOURCES += startup/start-config-pinsel.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/start-config-emc-dynamic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/start-config-emc-static.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/start-config-mpu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/start/start-config-pinsel.c
 
 ###############################################################################
 #                  Network                                                    #
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index d0bfb3c018..3ac8205474 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/lpc32xx/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -25,11 +25,11 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.lpc32xx
-dist_project_lib_DATA += startup/linkcmds.lpc32xx_phycore
-dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx_stage_1
-dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx_stage_2
-dist_project_lib_DATA += startup/linkcmds.lpc32xx_mzx
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc32xx/start/linkcmds.lpc32xx
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc32xx/start/linkcmds.lpc32xx_phycore
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx_stage_1
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx_stage_2
+dist_project_lib_DATA += ../../../../../../bsps/arm/lpc32xx/start/linkcmds.lpc32xx_mzx
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -47,12 +47,12 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/uart-output-char.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/start/bspstart.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
@@ -93,7 +93,7 @@ librtemsbsp_a_SOURCES += misc/idle-thread.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/start/bspstarthooks.c
 
 ###############################################################################
 #                  Network                                                    #
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index d0c168867e..41e50b1aae 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/raspberrypi/start/bsp_specs
 
 ###############################################################################
 # Header                                                     #
@@ -43,23 +43,23 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterdiff.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 if BSP_START_IN_HYP_SUPPORT
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-in-hyp-support.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-in-hyp-support.S
 endif
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/cmdline.c
-librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/cmdline.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspgetworkarea.c
 if HAS_SMP
-librtemsbsp_a_SOURCES += startup/bspsmp.c
-librtemsbsp_a_SOURCES += startup/bspsmp_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspsmp_init.c
 endif
 
 # Restart
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspreset.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
@@ -105,10 +105,10 @@ librtemsbsp_a_SOURCES += spi/spi.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspstarthooks.c
 
 # LIBMM
-librtemsbsp_a_SOURCES += startup/mm_config_table.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/mm_config_table.c
 librtemsbsp_a_SOURCES += ../shared/mminit.c
 
 ###############################################################################
diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
index 051d5ad299..5180cb8e12 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac
+++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac
@@ -53,5 +53,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-linkcmds:startup/linkcmds.in])
+linkcmds:../../../../../../bsps/arm/raspberrypi/start/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index 829fa617dc..64b89754a2 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/realview-pbx-a9/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -25,8 +25,8 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu
-dist_project_lib_DATA += startup/linkcmds.realview_pbx_a9_qemu_smp
+dist_project_lib_DATA += ../../../../../../bsps/arm/realview-pbx-a9/start/linkcmds.realview_pbx_a9_qemu
+dist_project_lib_DATA += ../../../../../../bsps/arm/realview-pbx-a9/start/linkcmds.realview_pbx_a9_qemu_smp
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -44,16 +44,16 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/bspstart.c
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-smp.c
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/bspsmp.c
 endif
 
 # IRQ
@@ -75,11 +75,11 @@ librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/bspstarthooks.c
 
 # Framebuffer
 librtemsbsp_a_SOURCES += ../shared/arm-pl111-fb.c
-librtemsbsp_a_SOURCES += startup/fb-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/fb-config.c
 
 ###############################################################################
 #                  Special Rules                                              #
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index d4ac6664e9..aff940c6ab 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/rtl22xx/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -20,9 +20,9 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/rtl22xx/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounterread.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 7fa8df5a80..dcfae9b564 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/smdk2410/start/bsp_specs
 
 
 start.$(OBJEXT): ../../../../../../bsps/arm/smdk2410/start/start.S
@@ -16,11 +16,11 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/start/bspidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/memmap.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/smdk2410/start/memmap.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index 4e5a2d5274..fd159fd6c1 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -7,15 +7,15 @@ include $(top_srcdir)/../../bsp.am
 #                  Data                                                       #
 ###############################################################################
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/stm32f4/start/bsp_specs
 
 start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.stm32f105rc
-dist_project_lib_DATA += startup/linkcmds.stm32f4
+dist_project_lib_DATA += ../../../../../../bsps/arm/stm32f4/start/linkcmds.stm32f105rc
+dist_project_lib_DATA += ../../../../../../bsps/arm/stm32f4/start/linkcmds.stm32f4
 
 ###############################################################################
 #                  Header                                                     #
@@ -39,13 +39,13 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
 
 # Startup
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspstarthook.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/io.c
-librtemsbsp_a_SOURCES += startup/rcc.c
-librtemsbsp_a_SOURCES += startup/start-config-io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/bspstarthook.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/io.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/rcc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/start/start-config-io.c
 
 # IRQ
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
diff --git a/c/src/lib/libbsp/arm/tms570/Makefile.am b/c/src/lib/libbsp/arm/tms570/Makefile.am
index 1a65fc1bb7..64bf43a58c 100644
--- a/c/src/lib/libbsp/arm/tms570/Makefile.am
+++ b/c/src/lib/libbsp/arm/tms570/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/tms570/start/bsp_specs
 
 # ----------------------------
 # ------  Headers
@@ -25,10 +25,10 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 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
+dist_project_lib_DATA += ../../../../../../bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk
+dist_project_lib_DATA += ../../../../../../bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_intram
+dist_project_lib_DATA += ../../../../../../bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_sdram
+dist_project_lib_DATA += ../../../../../../bsps/arm/tms570/start/linkcmds.tms570ls3137_hdk_with_loader
 
 # ----------------------------
 # ------  LibBSP
@@ -49,10 +49,10 @@ librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-init-registers.S
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-init-registers.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/start/bspstart.c
 
 # POM
 librtemsbsp_a_SOURCES += pom/tms570-pom.c
@@ -103,7 +103,7 @@ librtemsbsp_a_SOURCES += hwinit/tms570_tcram_tests.c
 librtemsbsp_a_SOURCES += hwinit/bspstarthooks-hwinit.c
 else
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/tms570/start/bspstarthooks.c
 endif
 
 # ----------------------------
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 746c605f68..0b8a86358d 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -10,7 +10,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/xilinx-zynq/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -42,16 +42,16 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/cpucounter/cpucounter
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/start/bspstart.c
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-smp.c
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/start/bspsmp.c
 endif
 
 # IRQ
@@ -74,8 +74,8 @@ librtemsbsp_a_SOURCES += i2c/cadence-i2c.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-l2c-310.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
-librtemsbsp_a_SOURCES += startup/bspstartmmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/start/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/start/bspstartmmu.c
 
 ###############################################################################
 #                  Special Rules                                              #
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
index efd0223a78..ec0a8f1074 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/configure.ac
@@ -144,5 +144,5 @@ RTEMS_BSP_CLEANUP_OPTIONS
 
 AC_CONFIG_FILES([
 Makefile
-linkcmds:startup/linkcmds.in])
+linkcmds:../../../../../../bsps/arm/xilinx-zynq/start/linkcmds.in])
 AC_OUTPUT
diff --git a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
index 1e5e9f18ba..d92a6bc73a 100644
--- a/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
+++ b/c/src/lib/libbsp/bfin/TLL6527M/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/bfin/TLL6527M/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -17,7 +17,7 @@ project_lib_DATA += linkcmds
 
 project_lib_LIBRARIES = librtemsbsp.a
 
-librtemsbsp_a_SOURCES = startup/bspstart.c
+librtemsbsp_a_SOURCES = ../../../../../../bsps/bfin/TLL6527M/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
index df7e2b939d..d3c9aacde9 100644
--- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
+++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/bfin/bf537Stamp/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -18,7 +18,7 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/bf537Stamp/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
index 46541c8be4..ef43e92795 100644
--- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
+++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/bfin/eZKit533/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -18,7 +18,7 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/bfin/eZKit533/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
index 0e4a1ba0bd..634d7ac546 100644
--- a/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
+++ b/c/src/lib/libbsp/epiphany/epiphany_sim/Makefile.am
@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/epiphany/epiphany_sim/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
diff --git a/c/src/lib/libbsp/i386/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am
index 2b3ee03a2a..094697ed57 100644
--- a/c/src/lib/libbsp/i386/pc386/Makefile.am
+++ b/c/src/lib/libbsp/i386/pc386/Makefile.am
@@ -11,7 +11,7 @@ CLEANFILES =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/i386/pc386/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -104,20 +104,20 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_bus_count.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/pci/pci_find_device.c
 
 # startup
-librtemsbsp_a_SOURCES += startup/bsp_fatal_halt.c
-librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += startup/bspidle.S
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspcmdline.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspidle.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspcmdline.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/bspreset.c
 librtemsbsp_a_SOURCES += ../shared/irq/idt.c
 librtemsbsp_a_SOURCES += ../shared/irq/irq.c
 librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
 librtemsbsp_a_SOURCES += ../shared/irq/elcr.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/ldsegs.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/i386/pc386/start/ldsegs.S
 librtemsbsp_a_SOURCES += ../shared/irq/irq_asm.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
@@ -140,7 +140,7 @@ appcpustart.$(OBJEXT): ../../../../../../bsps/i386/pc386/start/start16.S
 	$(CPPASCOMPILE) $(AM_CPPFLAGS) -DSMP_SECONDARY_CORE -o $@ -c $<
 
 appstart.$(OBJEXT): appcpustart.$(OBJEXT)
-	$(LD) -r -N -T $(top_srcdir)/startup/linkcmds \
+	$(LD) -r -N -T $(top_srcdir)/../../../../../../bsps/i386/pc386/start/linkcmds \
 	    -Ttext 0x70000 -e app_processor_start -nostdlib \
 	    -o appstart_tmp.exe $<
 	$(OBJCOPY) -O binary appstart_tmp.exe appstart.bin
diff --git a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
index cc89f66618..0ea3b97df1 100644
--- a/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
+++ b/c/src/lib/libbsp/lm32/lm32_evr/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/lm32/lm32_evr/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -21,12 +21,12 @@ librtemsbsp_a_LIBADD =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/start/bspreset.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/lm32/shared/clock/ckinit.c
 # console
diff --git a/c/src/lib/libbsp/lm32/milkymist/Makefile.am b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
index 72b269594e..99f530bd5a 100644
--- a/c/src/lib/libbsp/lm32/milkymist/Makefile.am
+++ b/c/src/lib/libbsp/lm32/milkymist/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/lm32/milkymist/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -20,8 +20,8 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_LIBADD =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/milkymist/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/lm32/shared/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
diff --git a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
index 226aadedd8..ac4a6c3836 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
+++ b/c/src/lib/libbsp/m32c/m32cbsp/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m32c/m32cbsp/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -19,10 +19,10 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/crtn.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/start/crtn.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m32c/m32cbsp/console/console-io.c
diff --git a/c/src/lib/libbsp/m68k/Makefile.am b/c/src/lib/libbsp/m68k/Makefile.am
index 6cdb89e301..669fe9b491 100644
--- a/c/src/lib/libbsp/m68k/Makefile.am
+++ b/c/src/lib/libbsp/m68k/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal
 ## Descend into the @RTEMS_BSP_FAMILY@ directory
 _SUBDIRS = @RTEMS_BSP_FAMILY@
 
-dist_project_lib_DATA = shared/startup/linkcmds.base
+dist_project_lib_DATA = ../../../../../bsps/m68k/shared/start/linkcmds.base
 
 
 
diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am
index 9081d18356..21cd09cd05 100644
--- a/c/src/lib/libbsp/m68k/av5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/av5282/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -21,8 +21,8 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/init5282.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/av5282/start/init5282.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/av5282/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am
index 91812aeec2..b73165982c 100644
--- a/c/src/lib/libbsp/m68k/csb360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/csb360/start/bsp_specs
 
 
 
@@ -21,7 +21,7 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += startup/init5272.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/csb360/start/init5272.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
index 7bf172e820..4ed9b832b4 100644
--- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/gen68340/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -21,11 +21,11 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += startup/init68340.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68340/start/init68340.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
-librtemsbsp_a_SOURCES += startup/dumpanic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68340/start/dumpanic.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/gen68340/clock/ckinit.c
diff --git a/c/src/lib/libbsp/m68k/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
index f4d4ec6319..7b27745ac6 100644
--- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am
+++ b/c/src/lib/libbsp/m68k/gen68360/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/gen68360/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -13,18 +13,18 @@ start.$(OBJEXT): ../../../../../../bsps/m68k/gen68360/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.bootp
-dist_project_lib_DATA += startup/linkcmds.prom
+dist_project_lib_DATA += ../../../../../../bsps/m68k/gen68360/start/linkcmds.bootp
+dist_project_lib_DATA += ../../../../../../bsps/m68k/gen68360/start/linkcmds.prom
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/alloc360.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68360/start/alloc360.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += startup/init68360.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/gen68360/start/init68360.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
index 751ae37092..01d369d5ef 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/genmcf548x/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -13,9 +13,9 @@ start.$(OBJEXT): ../../../../../../bsps/m68k/genmcf548x/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.COBRA5475
-dist_project_lib_DATA += startup/linkcmds.m5484FireEngine
-dist_project_lib_DATA += startup/linkcmds.m5484FireEngine.flash
+dist_project_lib_DATA += ../../../../../../bsps/m68k/genmcf548x/start/linkcmds.COBRA5475
+dist_project_lib_DATA += ../../../../../../bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine
+dist_project_lib_DATA += ../../../../../../bsps/m68k/genmcf548x/start/linkcmds.m5484FireEngine.flash
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -25,8 +25,8 @@ librtemsbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
-librtemsbsp_a_SOURCES += startup/init548x.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/start/init548x.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/genmcf548x/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 437ea430c9..0b7af1ad0a 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mcf5206elite/start/bsp_specs
 
 
 _SUBDIRS = . tools
@@ -15,9 +15,9 @@ start.$(OBJEXT): ../../../../../../bsps/m68k/mcf5206elite/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.flash
+dist_project_lib_DATA += ../../../../../../bsps/m68k/mcf5206elite/start/linkcmds.flash
 
-dist_project_lib_DATA += startup/gdbinit
+dist_project_lib_DATA += ../../../../../../bsps/m68k/mcf5206elite/start/gdbinit
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -26,7 +26,7 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += startup/init5206e.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/start/init5206e.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
index 49e66b59ca..9773a7d9f6 100644
--- a/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf52235/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mcf52235/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -21,10 +21,10 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/init52235.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/start/init52235.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += startup/cfinit.c
-librtemsbsp_a_SOURCES += startup/bspgetcpuclockspeed.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/start/cfinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf52235/start/bspgetcpuclockspeed.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
index c269671497..003c91780c 100644
--- a/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5225x/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mcf5225x/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -18,8 +18,8 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES = ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/init5225x.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/start/init5225x.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5225x/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
index 1aef14289e..a243dbe0fb 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mcf5235/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -12,9 +12,9 @@ start.$(OBJEXT): ../../../../../../bsps/m68k/mcf5235/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds
-dist_project_lib_DATA += startup/linkcmdsflash
-dist_project_lib_DATA += startup/linkcmdsram
+dist_project_lib_DATA += ../../../../../../bsps/m68k/mcf5235/start/linkcmds
+dist_project_lib_DATA += ../../../../../../bsps/m68k/mcf5235/start/linkcmdsflash
+dist_project_lib_DATA += ../../../../../../bsps/m68k/mcf5235/start/linkcmdsram
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -22,14 +22,14 @@ librtemsbsp_a_SOURCES =
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
-librtemsbsp_a_SOURCES += startup/bspgetcpuclockspeed.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/start/bspgetcpuclockspeed.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/init5235.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/start/init5235.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/copyvectors.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5235/start/copyvectors.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/m68k/mcf5235/clock/clock.c
 # console
diff --git a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
index 9429d511e2..2e5d6100bf 100644
--- a/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5329/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mcf5329/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -13,7 +13,7 @@ start.$(OBJEXT): ../../../../../../bsps/m68k/mcf5329/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmdsflash
+dist_project_lib_DATA += ../../../../../../bsps/m68k/mcf5329/start/linkcmdsflash
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -22,9 +22,9 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/init5329.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/cfinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5329/start/init5329.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5329/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5329/start/cfinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 11d6ea953c..73aa3bc3be 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mrm332/start/bsp_specs
 
 
 
@@ -17,7 +17,7 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/start_c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mrm332/start/start_c.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mrm332/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
index f3ca13d7ea..336ebd9f72 100644
--- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mvme147/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -20,8 +20,8 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
index a295839808..72ba5c5213 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mvme147s/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -21,7 +21,7 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme147s/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 229e73ecf3..f94d3557c2 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mvme162/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -19,12 +19,12 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/page_table.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/start/page_table.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/page_table.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/start/page_table.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
index 0fee829838..7cca60608f 100644
--- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/mvme167/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -18,11 +18,11 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/start/bspclean.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/page_table.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/start/page_table.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
diff --git a/c/src/lib/libbsp/m68k/uC5282/Makefile.am b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
index 85d18e2309..71612329b7 100644
--- a/c/src/lib/libbsp/m68k/uC5282/Makefile.am
+++ b/c/src/lib/libbsp/m68k/uC5282/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/m68k/uC5282/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -18,11 +18,11 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/init5282.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/start/init5282.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/uC5282/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/setvec.c
diff --git a/c/src/lib/libbsp/mips/csb350/Makefile.am b/c/src/lib/libbsp/mips/csb350/Makefile.am
index fc43b2e3c4..a5c9de4e71 100644
--- a/c/src/lib/libbsp/mips/csb350/Makefile.am
+++ b/c/src/lib/libbsp/mips/csb350/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/mips/csb350/start/bsp_specs
 
 #isr
 
@@ -20,9 +20,9 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/csb350/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/csb350/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 # clock
diff --git a/c/src/lib/libbsp/mips/hurricane/Makefile.am b/c/src/lib/libbsp/mips/hurricane/Makefile.am
index 61a75df178..ed952418d0 100644
--- a/c/src/lib/libbsp/mips/hurricane/Makefile.am
+++ b/c/src/lib/libbsp/mips/hurricane/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/mips/hurricane/start/bsp_specs
 
 #isr
 
@@ -22,14 +22,14 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/inittlb.c
-librtemsbsp_a_SOURCES += ../shared/startup/idtmem.S
-librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/start/inittlb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
 librtemsbsp_a_SOURCES += ../shared/irq/exception.S
-librtemsbsp_a_SOURCES += startup/usc.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/hurricane/start/usc.S
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/hurricane/clock/ckinit.c
 
diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
index 9c9ffcf56d..b0bb53711a 100644
--- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am
+++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/mips/jmr3904/start/bsp_specs
 
 #isr
 
@@ -21,7 +21,7 @@ librtemsbsp_a_SOURCES =
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/jmr3904/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 # clock
diff --git a/c/src/lib/libbsp/mips/malta/Makefile.am b/c/src/lib/libbsp/mips/malta/Makefile.am
index b7bea74064..ce78801123 100644
--- a/c/src/lib/libbsp/mips/malta/Makefile.am
+++ b/c/src/lib/libbsp/mips/malta/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/mips/malta/start/bsp_specs
 
 #isr
 #pci
@@ -23,15 +23,15 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/simple_access.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/start/simple_access.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/start/bspreset.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/inittlb.c
-librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/malta/start/inittlb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
 
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/shared/clock/clockdrv.c
diff --git a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
index ca8846dfd4..b483b2413e 100644
--- a/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4925/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/mips/rbtx4925/start/bsp_specs
 
 #isr
 
@@ -23,12 +23,12 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4925/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/inittlb.c
-librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
-librtemsbsp_a_SOURCES += ../shared/startup/idtmem.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4925/start/inittlb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
 librtemsbsp_a_SOURCES += ../shared/irq/exception.S
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4925/clock/clockdrv.c
diff --git a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
index 2125aec0e7..d8b53efe8b 100644
--- a/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
+++ b/c/src/lib/libbsp/mips/rbtx4938/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/mips/rbtx4938/start/bsp_specs
 
 #isr
 
@@ -24,12 +24,12 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/inittlb.c
-librtemsbsp_a_SOURCES += ../shared/startup/idttlb.S
-librtemsbsp_a_SOURCES += ../shared/startup/idtmem.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/rbtx4938/start/inittlb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idttlb.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/mips/shared/start/idtmem.S
 librtemsbsp_a_SOURCES += ../shared/irq/exception.S
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/mips/rbtx4938/clock/clockdrv.c
diff --git a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
index 46743bd7da..d0ef5dd019 100644
--- a/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
+++ b/c/src/lib/libbsp/moxie/moxiesim/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/moxie/moxiesim/start/bsp_specs
 
 
 
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
index 8430a359f0..77dcb81762 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
+++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/nios2/nios2_iss/start/bsp_specs
 
 
 
@@ -22,11 +22,11 @@ librtemsbsp_a_CPPFLAGS = $(AM_CPPFLAGS)
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/nios2/nios2_iss/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/nios2/nios2_iss/start/setvec.c
 
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/nios2/nios2_iss/clock/clock.c
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
index 8b2b05c7e2..2976ad672e 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/no_cpu/no_bsp/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -14,11 +14,11 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += ../../shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/no_cpu/no_bsp/start/setvec.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/no_cpu/no_bsp/clock/ckinit.c
diff --git a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
index fecd2e8c19..6a0fe40683 100644
--- a/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
+++ b/c/src/lib/libbsp/or1k/generic_or1k/Makefile.am
@@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/or1k/generic_or1k/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -24,7 +24,7 @@ start.$(OBJEXT): ../../../../../../bsps/or1k/generic_or1k/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/or1k/shared/start/linkcmds.base
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -38,7 +38,7 @@ librtemsbsp_a_LIBADD =
 
 # Startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/or1k/generic_or1k/start/bspstart.c
 
 # Shared
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index ecd7f6a8a4..a2910c7fbb 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -6,7 +6,7 @@ noinst_PROGRAMS =
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/beatnik/start/bsp_specs
 
 project_lib_DATA      = 
 
@@ -36,23 +36,23 @@ project_lib_DATA += motld_start.$(OBJEXT)
 #startup
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.share
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/start/bspstart.c
 librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/i2c_init.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/start/i2c_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/start/bspclean.c
 
 #pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 72767c0bc8..c1d6e24918 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/gen5200/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -18,13 +18,13 @@ rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.brs5l
-dist_project_lib_DATA += startup/linkcmds.brs6l
-dist_project_lib_DATA += startup/linkcmds.dp2
-dist_project_lib_DATA += startup/linkcmds.gen5200_base
-dist_project_lib_DATA += startup/linkcmds.icecube
-dist_project_lib_DATA += startup/linkcmds.pm520_cr825
-dist_project_lib_DATA += startup/linkcmds.pm520_ze30
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.brs5l
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.brs6l
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.dp2
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.gen5200_base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.icecube
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.pm520_cr825
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen5200/start/linkcmds.pm520_ze30
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -94,14 +94,14 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-uboot-board-info.c
 librtemsbsp_a_SOURCES += ../shared/showbats.c
 librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
 librtemsbsp_a_SOURCES += ../shared/uboot_dump_bdinfo.c
 librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/cpuinit.c 
-librtemsbsp_a_SOURCES += startup/uboot_support.c
-librtemsbsp_a_SOURCES += startup/bestcomm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/cpuinit.c 
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/uboot_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/start/bestcomm.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network_5200/network.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index c91db0bdae..1f99f2c30c 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/gen83xx/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -18,13 +18,13 @@ rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.br_uid
-dist_project_lib_DATA += startup/linkcmds.hsc_cm01
-dist_project_lib_DATA += startup/linkcmds.mpc8309som
-dist_project_lib_DATA += startup/linkcmds.mpc8313erdb
-dist_project_lib_DATA += startup/linkcmds.mpc8349eamds
-dist_project_lib_DATA += startup/linkcmds.mpc83xx
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen83xx/start/linkcmds.br_uid
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen83xx/start/linkcmds.hsc_cm01
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen83xx/start/linkcmds.mpc8309som
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen83xx/start/linkcmds.mpc8313erdb
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen83xx/start/linkcmds.mpc8349eamds
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/gen83xx/start/linkcmds.mpc83xx
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -33,12 +33,12 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../shared/src/tictac.c
-librtemsbsp_a_SOURCES += startup/cpuinit.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/start/cpuinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bsprestart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/start/bsprestart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-uboot-board-info.c
 librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 32c87428cf..b617fd5f11 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/haleakala/start/bsp_specs
 
 
 
@@ -19,7 +19,7 @@ librtemsbsp_a_SOURCES =
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/haleakala/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 496d8c418c..b0bea03813 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -9,7 +9,7 @@ endif
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/motorola_powerpc/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -28,23 +28,23 @@ vectors_entry.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/vectors_ent
 project_lib_DATA += vectors_entry.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.share
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/start/bspstart.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../shared/showbats.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../shared/startup/ppc_idle.c
-librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/ppc_idle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/start/bspreset.c
 
 
 # tod
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 4db2f8ac1d..74ec50343f 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/mpc55xxevb/start/bsp_specs
 
 
 
@@ -19,22 +19,22 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 
 # Link commands
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.gwlcfm
-dist_project_lib_DATA += startup/linkcmds.mpc5566evb
-dist_project_lib_DATA += startup/linkcmds.mpc5566evb_spe
-dist_project_lib_DATA += startup/linkcmds.mpc55xx
-dist_project_lib_DATA += startup/linkcmds.mpc5643l_dpu
-dist_project_lib_DATA += startup/linkcmds.mpc5643l_evb
-dist_project_lib_DATA += startup/linkcmds.mpc5668g
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_app
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_boot
-dist_project_lib_DATA += startup/linkcmds.mpc5674fevb
-dist_project_lib_DATA += startup/linkcmds.mpc5674fevb_spe
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6
-dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_base
-dist_project_lib_DATA += startup/linkcmds.phycore_mpc5554
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.gwlcfm
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5566evb
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5566evb_spe
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc55xx
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5643l_dpu
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5643l_evb
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5668g
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508_app
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_ecu508_boot
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674fevb
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674fevb_spe
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_rsm6
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.mpc5674f_rsm6_base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/mpc55xxevb/start/linkcmds.phycore_mpc5554
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -47,26 +47,26 @@ librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
 librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
 librtemsbsp_a_SOURCES += ../shared/src/tictac.c
 librtemsbsp_a_SOURCES += ../shared/src/ppc-exc-handler-table.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += startup/exc-vector-base.S
-librtemsbsp_a_SOURCES += startup/get-system-clock.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/restart.c
-librtemsbsp_a_SOURCES += startup/idle-thread.c
-librtemsbsp_a_SOURCES += startup/start-config-clock.c
-librtemsbsp_a_SOURCES += startup/start-config-ebi.c
-librtemsbsp_a_SOURCES += startup/start-config-ebi-cs.c
-librtemsbsp_a_SOURCES += startup/start-config-ebi-cs-cal.c
-librtemsbsp_a_SOURCES += startup/start-config-mmu.c
-librtemsbsp_a_SOURCES += startup/start-config-mmu-early.c
-librtemsbsp_a_SOURCES += startup/start-config-siu-pcr.c
-librtemsbsp_a_SOURCES += startup/start-prologue.c
-librtemsbsp_a_SOURCES += startup/start-early.c
-librtemsbsp_a_SOURCES += startup/start-cache.S
-librtemsbsp_a_SOURCES += startup/start-clock.c
-librtemsbsp_a_SOURCES += startup/start-flash.S
-librtemsbsp_a_SOURCES += startup/start-watchdog.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/exc-vector-base.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/get-system-clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/restart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/idle-thread.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-ebi.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-mmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-prologue.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-early.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-cache.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-flash.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/start-watchdog.c
 
 # clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/mpc55xxevb/clock/clock-config.c
@@ -81,7 +81,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/console/conso
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # Misc
-librtemsbsp_a_SOURCES += startup/sd-card-init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/sd-card-init.c
 
 # I2C
 librtemsbsp_a_SOURCES += i2c/i2c_init.c
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 03ef7c2ad8..4e10602377 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/mpc8260ads/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -33,11 +33,11 @@ librtemsbsp_a_SOURCES += irq/irq.c
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/cpuinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index a94f30f667..f0fdf86cf8 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/mvme3100/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -31,17 +31,17 @@ rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.share
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/misc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/start/misc.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 6bc09151ff..8af0c2bbb1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/mvme5500/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -14,16 +14,16 @@ librtemsbsp_a_SOURCES =
 # UNUSED
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/pgtbl_activate.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/probeMemEnd.c
 
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
@@ -72,7 +72,7 @@ mvme5500start___OBJEXT__LDFLAGS = $(RTEMS_RELLDFLAGS)
 project_lib_DATA += mvme5500start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.share
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.share
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 575d939f2a..ba26ca315d 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/psim/start/bsp_specs
 
 
 
@@ -16,17 +16,17 @@ rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/psim/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
 # pclock
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index b918506e3b..d87eb49b56 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/qemuppc/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -26,8 +26,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/cmain.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qemuppc/start/cmain.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qemuppc/start/bspstart.c
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
 # console
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index a182369171..cd245dfc79 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/qoriq/start/bsp_specs
 
 
 
@@ -23,12 +23,12 @@ rtems_crtn.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crtn.S
 project_lib_DATA += rtems_crtn.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.qoriq_core_0
-dist_project_lib_DATA += startup/linkcmds.qoriq_core_1
-dist_project_lib_DATA += startup/linkcmds.qoriq_e500
-dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_32
-dist_project_lib_DATA += startup/linkcmds.qoriq_e6500_64
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/qoriq/start/linkcmds.qoriq_core_0
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/qoriq/start/linkcmds.qoriq_core_1
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/qoriq/start/linkcmds.qoriq_e500
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/qoriq/start/linkcmds.qoriq_e6500_32
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/qoriq/start/linkcmds.qoriq_e6500_64
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -41,18 +41,18 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-fdt.c
 librtemsbsp_a_SOURCES += ../shared/src/ppc-exc-handler-table.c
 librtemsbsp_a_SOURCES += ../shared/src/tictac.c
 librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
-librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
-librtemsbsp_a_SOURCES += startup/epapr_hcalls.S
-librtemsbsp_a_SOURCES += startup/l1cache.S
-librtemsbsp_a_SOURCES += startup/l2cache.S
-librtemsbsp_a_SOURCES += startup/mmu.c
-librtemsbsp_a_SOURCES += startup/mmu-tlb1.S
-librtemsbsp_a_SOURCES += startup/mmu-config.c
-librtemsbsp_a_SOURCES += startup/portal.c
-librtemsbsp_a_SOURCES += startup/restart.S
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bsprestart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/epapr_hcalls.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/l1cache.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/l2cache.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/mmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/mmu-tlb1.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/mmu-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/portal.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/restart.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/bsprestart.c
 
 # Clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/qoriq/clock/clock-config.c
@@ -90,7 +90,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
 if HAS_SMP
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/bspsmp.c
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 94d1e18bd8..86dc3c56ac 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/ss555/start/bsp_specs
 
 
 
@@ -22,15 +22,15 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/ss555/clock/p_clock.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/console/console.c
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/iss555.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/iss555.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/start.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # tm27supp
-librtemsbsp_a_SOURCES += startup/tm27supp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/tm27supp.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/btimer/btimer-ppc-dec.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 97917a78da..71dc32b321 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/t32mppc/start/bsp_specs
 
 
 
@@ -19,8 +19,8 @@ rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.t32mppc
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/t32mppc/start/linkcmds.t32mppc
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../shared/src/ppc-exc-handler-table.c
 librtemsbsp_a_SOURCES += ../shared/src/tictac.c
 librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/t32mppc/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/t32mppc/start/bspreset.c
 
 # Clock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/t32mppc/clock/clock-config.c
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index e447672b8e..2e94f2beb4 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/tqm8xx/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -18,7 +18,7 @@ rtems_crti.$(OBJEXT): ../../../../../../bsps/powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -39,12 +39,12 @@ librtemsbsp_a_SOURCES += spi/spi.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += startup/mmutlbtab.c
-librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmutlbtab.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/cpuinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index fe4c8d4ac4..e884c8f0e3 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex/start/bsp_specs
 
 if HAS_NETWORKING
 endif
@@ -22,7 +22,7 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 
 # Link commands
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/powerpc/shared/start/linkcmds.base
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -32,7 +32,7 @@ librtemsbsp_a_LIBADD =
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
diff --git a/c/src/lib/libbsp/powerpc/virtex/configure.ac b/c/src/lib/libbsp/powerpc/virtex/configure.ac
index 6650179563..da5e823177 100644
--- a/c/src/lib/libbsp/powerpc/virtex/configure.ac
+++ b/c/src/lib/libbsp/powerpc/virtex/configure.ac
@@ -42,7 +42,7 @@ RTEMS_BSP_CLEANUP_OPTIONS
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([
 Makefile
-linkcmds:startup/linkcmds.in
+linkcmds:../../../../../../bsps/powerpc/virtex/start/linkcmds.in
 ])
 
 RTEMS_PPC_EXCEPTIONS
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 60a179740c..350807f1de 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex4/start/bsp_specs
 
 # include
 
@@ -18,10 +18,10 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = startup/bspclean.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES = ../../../../../../bsps/powerpc/virtex4/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex4/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex4/start/start.S
 
 # console
-librtemsbsp_a_SOURCES += startup/dummy_console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex4/start/dummy_console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 
 # irq
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 81f78e198e..8bb9be4c7e 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/powerpc/virtex5/start/bsp_specs
 
 # include
 
@@ -17,10 +17,10 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = startup/bspclean.c
-librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES = ../../../../../../bsps/powerpc/virtex5/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/zerobss.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex5/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
@@ -33,7 +33,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex5/start/start.S
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += startup/dummy_console.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/virtex5/start/dummy_console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 
 # irq
diff --git a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
index 0d9e406111..43c36ef155 100644
--- a/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
+++ b/c/src/lib/libbsp/riscv/riscv_generic/Makefile.am
@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/riscv/riscv_generic/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -33,7 +33,7 @@ project_lib_LIBRARIES = librtemsbsp.a
 # Startup
 librtemsbsp_a_SOURCES = ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
-librtemsbsp_a_SOURCES += startup/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/riscv/riscv_generic/start/bsp_fatal_halt.c
 
 # Shared
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am
index 11a14693a0..ea1891aede 100644
--- a/c/src/lib/libbsp/sh/gensh1/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sh/gensh1/start/bsp_specs
 
 
 
@@ -24,7 +24,7 @@ BUILT_SOURCES = scitab.c
 CLEANFILES = scitab.c
 
 # startup
-librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-loop.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh1/clock/ckinit.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh1/clock/delay.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c
-librtemsbsp_a_SOURCES += startup/ispsh7032.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/start/cpu_asm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh1/start/ispsh7032.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # scitab
 librtemsbsp_a_SOURCES += scitab.c
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am
index bcac43ec8a..b7e45f6c27 100644
--- a/c/src/lib/libbsp/sh/gensh2/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sh/gensh2/start/bsp_specs
 
 
 
@@ -12,8 +12,8 @@ start.$(OBJEXT): ../../../../../../bsps/sh/gensh2/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.ram
-dist_project_lib_DATA += startup/linkcmds.rom
+dist_project_lib_DATA += ../../../../../../bsps/sh/gensh2/start/linkcmds.ram
+dist_project_lib_DATA += ../../../../../../bsps/sh/gensh2/start/linkcmds.rom
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -26,8 +26,8 @@ BUILT_SOURCES = scitab.c
 CLEANFILES = scitab.c
 
 # startup
-librtemsbsp_a_SOURCES += startup/hw_init.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/hw_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
@@ -35,8 +35,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh2/clock/ckinit.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c
-librtemsbsp_a_SOURCES += startup/ispsh7045.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/cpu_asm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh2/start/ispsh7045.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # scitab
 librtemsbsp_a_SOURCES += scitab.c
diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am
index 97cea6de1a..33d9a539dc 100644
--- a/c/src/lib/libbsp/sh/gensh4/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sh/gensh4/start/bsp_specs
 
 
 start.$(OBJEXT): ../../../../../../bsps/sh/gensh4/start/start.S
@@ -11,22 +11,22 @@ start.$(OBJEXT): ../../../../../../bsps/sh/gensh4/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.rom
-dist_project_lib_DATA += startup/linkcmds.rom2ram
+dist_project_lib_DATA += ../../../../../../bsps/sh/gensh4/start/linkcmds.rom
+dist_project_lib_DATA += ../../../../../../bsps/sh/gensh4/start/linkcmds.rom2ram
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c
-librtemsbsp_a_SOURCES += startup/ispsh7750.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/start/cpu_asm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/gensh4/start/ispsh7750.c
 librtemsbsp_a_SOURCES +=../../../../../../bsps/sh/gensh4/clock/ckinit.c
 librtemsbsp_a_SOURCES += timer/timer.c
 # console
diff --git a/c/src/lib/libbsp/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am
index 94659c1be4..8afff7af2c 100644
--- a/c/src/lib/libbsp/sh/shsim/Makefile.am
+++ b/c/src/lib/libbsp/sh/shsim/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sh/shsim/start/bsp_specs
 
 
 
@@ -17,16 +17,16 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shared/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../shared/bsphwinit.c
-librtemsbsp_a_SOURCES += startup/sysexit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shsim/start/sysexit.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/cpu_asm.c
-librtemsbsp_a_SOURCES += startup/ispshgdb.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shsim/start/cpu_asm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sh/shsim/start/ispshgdb.c
 
 # clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index df9aefa8bb..3171e0b697 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sparc/erc32/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -14,26 +14,26 @@ start.$(OBJEXT): ../../../../../../bsps/sparc/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/sparc/shared/start/linkcmds.base
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/setvec.c
-librtemsbsp_a_SOURCES += startup/spurious.c
-librtemsbsp_a_SOURCES += startup/erc32mec.c
-librtemsbsp_a_SOURCES += startup/boardinit.S
-librtemsbsp_a_SOURCES += startup/bspidle.c
-librtemsbsp_a_SOURCES += startup/bspdelay.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_exit.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/spurious.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/erc32mec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/boardinit.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/erc32/start/bspdelay.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_exit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_halt.c
 # ISR Handler
 librtemsbsp_a_SOURCES += ../shared/cpu.c
 librtemsbsp_a_SOURCES += ../shared/irq_asm.S
diff --git a/c/src/lib/libbsp/sparc/leon2/Makefile.am b/c/src/lib/libbsp/sparc/leon2/Makefile.am
index 1b15b0249f..34cd6fcd12 100644
--- a/c/src/lib/libbsp/sparc/leon2/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon2/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sparc/leon2/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -14,9 +14,9 @@ start.$(OBJEXT): ../../../../../../bsps/sparc/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.at697f
-dist_project_lib_DATA += startup/linkcmds.leon2
+dist_project_lib_DATA += ../../../../../../bsps/sparc/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon2/start/linkcmds.at697f
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon2/start/linkcmds.leon2
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
@@ -24,16 +24,16 @@ librtemsbsp_a_SOURCES =
 # startup
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/setvec.c
-librtemsbsp_a_SOURCES += startup/spurious.c
-librtemsbsp_a_SOURCES += startup/bspidle.c
-librtemsbsp_a_SOURCES += startup/bspdelay.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_exit.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/spurious.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/bspidle.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon2/start/bspdelay.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_exit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_halt.c
 
 # ISR Handler
 librtemsbsp_a_SOURCES += ../shared/cpu.c
diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index a94dfd2c56..df75c03552 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sparc/leon3/start/bsp_specs
 
 
 noinst_PROGRAMS =
@@ -14,30 +14,30 @@ start.$(OBJEXT): ../../../../../../bsps/sparc/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += ../shared/startup/linkcmds.base
-dist_project_lib_DATA += startup/linkcmds.gr712rc
-dist_project_lib_DATA += startup/linkcmds.gr740
-dist_project_lib_DATA += startup/linkcmds.leon3
-dist_project_lib_DATA += startup/linkcmds.ut699
-dist_project_lib_DATA += startup/linkcmds.ut700
+dist_project_lib_DATA += ../../../../../../bsps/sparc/shared/start/linkcmds.base
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon3/start/linkcmds.gr712rc
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon3/start/linkcmds.gr740
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon3/start/linkcmds.leon3
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon3/start/linkcmds.ut699
+dist_project_lib_DATA += ../../../../../../bsps/sparc/leon3/start/linkcmds.ut700
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/setvec.c
-librtemsbsp_a_SOURCES += startup/spurious.c
-librtemsbsp_a_SOURCES += startup/bspidle.S
-librtemsbsp_a_SOURCES += startup/bspdelay.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/spurious.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bspidle.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bspdelay.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += startup/cpucounter.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp_fatal_exit.c
-librtemsbsp_a_SOURCES += startup/bsp_fatal_halt.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/cpucounter.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/shared/start/bsp_fatal_exit.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bsp_fatal_halt.c
 
 # ISR Handler
 librtemsbsp_a_SOURCES += ../shared/cpu.c
@@ -75,7 +75,7 @@ librtemsbsp_a_SOURCES += ../shared/uart/apbuart_cons.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/console/printk_support.c
 
 # IRQ
-librtemsbsp_a_SOURCES += startup/eirq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/eirq.c
 librtemsbsp_a_SOURCES += ../shared/irq/genirq.c
 librtemsbsp_a_SOURCES += ../shared/irq/irq-shared.c
 librtemsbsp_a_SOURCES += ../shared/irq/bsp_isr_handler.c
@@ -174,7 +174,7 @@ librtemsbsp_a_SOURCES += ../shared/drvmgr/ambapp_bus_grlib.c
 librtemsbsp_a_SOURCES += ../shared/drvmgr/get_resarray_count.c
 
 if HAS_SMP
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc/leon3/start/bspsmp.c
 endif
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/sparc64/niagara/Makefile.am b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
index c9489bdccc..23193dc6f7 100644
--- a/c/src/lib/libbsp/sparc64/niagara/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/niagara/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sparc64/niagara/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -13,18 +13,18 @@ start.$(OBJEXT): ../../../../../../bsps/sparc64/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += ../shared/startup/linkcmds
+dist_project_lib_DATA += ../../../../../../bsps/sparc64/shared/start/linkcmds
 
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
-librtemsbsp_a_SOURCES += startup/bspclean.c
-librtemsbsp_a_SOURCES += startup/m5op_sparc.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/niagara/start/bspclean.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/niagara/start/m5op_sparc.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += ../shared/startup/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/balloc.c
 librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw.c
 librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw_tree.c
diff --git a/c/src/lib/libbsp/sparc64/usiii/Makefile.am b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
index ee7f4957f5..1ddd825b29 100644
--- a/c/src/lib/libbsp/sparc64/usiii/Makefile.am
+++ b/c/src/lib/libbsp/sparc64/usiii/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/sparc64/usiii/start/bsp_specs
 
 ## these are the include files used by the boot process from HelenOS Sparc64
 ## These include files mimic the HelenOS kernel include layout, which 
@@ -21,7 +21,7 @@ start.$(OBJEXT): ../../../../../../bsps/sparc64/shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += ../shared/startup/linkcmds
+dist_project_lib_DATA += ../../../../../../bsps/sparc64/shared/start/linkcmds
 
 project_lib_LIBRARIES = librtemsbsp.a 
 librtemsbsp_a_SOURCES =
@@ -31,7 +31,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
-librtemsbsp_a_SOURCES += ../shared/startup/setvec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/sparc64/shared/start/setvec.c
 librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/balloc.c
 librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw.c
 librtemsbsp_a_SOURCES += ../shared/helenos/boot/genarch/ofw_tree.c
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
index fdd6cab5b5..233a160f6b 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
+++ b/c/src/lib/libbsp/v850/gdbv850sim/Makefile.am
@@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/v850/gdbv850sim/start/bsp_specs
 
 noinst_PROGRAMS =
 
@@ -22,9 +22,9 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspgetworkarea-defa
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspstart-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/v850/gdbv850sim/start/bspreset.c
 librtemsbsp_a_SOURCES += ../shared/crt1.c
-librtemsbsp_a_SOURCES += startup/trap.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/v850/gdbv850sim/start/trap.S
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/clock/clock-simidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-polled.c
diff --git a/testsuites/aclocal/prog-cc.m4 b/testsuites/aclocal/prog-cc.m4
index 748c76b39d..44d07d8585 100644
--- a/testsuites/aclocal/prog-cc.m4
+++ b/testsuites/aclocal/prog-cc.m4
@@ -25,7 +25,7 @@ dnl check target cc
 RTEMS_PROG_CC
 
 AS_IF([test x"$GCC" = xyes],[
-GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/c/src/lib/libbsp/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/startup/"
+GCCSPECS="-B\$(RTEMS_SOURCE_ROOT)/bsps/\$(RTEMS_CPU)/\$(RTEMS_BSP_FAMILY)/start"
 GCCSPECS="${GCCSPECS} -specs bsp_specs -qrtems"])
 AC_SUBST(GCCSPECS)
 
diff --git a/testsuites/aclocal/rtems-bsp-linkcmds.m4 b/testsuites/aclocal/rtems-bsp-linkcmds.m4
index a4137e18de..0ad8867f9d 100644
--- a/testsuites/aclocal/rtems-bsp-linkcmds.m4
+++ b/testsuites/aclocal/rtems-bsp-linkcmds.m4
@@ -16,8 +16,8 @@ AC_REQUIRE([RTEMS_BUILD_TOP])
 
 AC_MSG_CHECKING([BSP linkcmds])
 
-RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/c/src/lib/libbsp/${RTEMS_CPU}"
-RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/startup"
+RTEMS_BSP_ARCH_PATH="${RTEMS_SOURCE_ROOT}/bsps/${RTEMS_CPU}"
+RTEMS_BSP_ARCH_LINKCMDS_PATH="${RTEMS_BSP_ARCH_PATH}/shared/start"
 RTEMS_BSP_LIBBSP_PATH="${RTEMS_BUILD_ROOT}/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP_FAMILY}"
 
 AC_SUBST(RTEMS_BSP_ARCH_LINKCMDS_PATH)