bsps: Simplify source file path in Makefile.am

This patch is a part of the BSP source reorganization.

Update #3285.

18 files changed, 85 insertions, 85 deletions

diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index fac308bee3..2714d81fd2 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -13,18 +13,18 @@ project_lib_DATA      =
 #include
 
 #start
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -DASM -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
 
-preload.$(OBJEXT): ../../powerpc/shared/start/preload.S
+preload.$(OBJEXT): ../shared/start/preload.S
 	$(CPPASCOMPILE) -DASM -o $@ -c $<
 
-vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
+vectors_entry.$(OBJEXT): ../shared/start/vectors_entry.S
 	$(CPPASCOMPILE) -DASM -o $@ -c $<
 
-start.$(OBJEXT): ../../powerpc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -DASM -o $@ -c $<
 
 motld_start.$(OBJEXT):	preload.$(OBJEXT) vectors_entry.$(OBJEXT) start.$(OBJEXT)
@@ -45,24 +45,24 @@ librtemsbsp_a_SOURCES += startup/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 += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/probeMemEnd.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.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 += ../../shared/bootcard.c
 librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += startup/bspclean.c
 librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 
 #pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 
 #console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
 
 #irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
@@ -79,11 +79,11 @@ librtemsbsp_a_SOURCES += ../shared/flash/intelFlash.c
 librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 #pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci.c
 librtemsbsp_a_SOURCES += pci/gt_pci_init.c
 librtemsbsp_a_SOURCES += pci/pci_io_remap.c
 librtemsbsp_a_SOURCES += pci/motload_fixup.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
 
 #network
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 4a6d15d5b4..39e33fb0f9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index a3ece5d493..cd6e3e1458 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index b4af09af38..e597f93c86 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -7,7 +7,7 @@ dist_project_lib_DATA = startup/bsp_specs
 
 
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
@@ -33,8 +33,8 @@ librtemsbsp_a_SOURCES += mmu/mmu_405asm.S
 librtemsbsp_a_SOURCES += dlentry/dlentry.S
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index fee29c28d3..8bf45ccc9c 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -15,15 +15,15 @@ dist_project_lib_DATA = startup/bsp_specs
 noinst_PROGRAMS =
 
 
-start.$(OBJEXT): ../../powerpc/shared/start/start.S
+start.$(OBJEXT): ../shared/start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-vectors_entry.$(OBJEXT): ../../powerpc/shared/start/vectors_entry.S
+vectors_entry.$(OBJEXT): ../shared/start/vectors_entry.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += vectors_entry.$(OBJEXT)
 
@@ -34,15 +34,15 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/showbats.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/ppc_idle.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspstart.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/showbats.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.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 += ../../shared/bootcard.c
 librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../shared/bspclean.c
@@ -52,34 +52,34 @@ librtemsbsp_a_SOURCES += startup/bspreset.c
 
 # tod
 librtemsbsp_a_SOURCES += ../../shared/tod.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/tod/todcfg.c
+librtemsbsp_a_SOURCES += ../shared/tod/todcfg.c
 # pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/dev/polled_io.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
 
 # irq
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c
+librtemsbsp_a_SOURCES += ../shared/irq/irq_init.c
+librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../shared/irq/i8259.c
 
 # motorola
-librtemsbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
+librtemsbsp_a_SOURCES += ../shared/motorola/motorola.c
 
 # openpic
-librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
 
 # pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../shared/pci/detect_raven_bridge.c
+librtemsbsp_a_SOURCES += ../shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
 
 # residual
-librtemsbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
+librtemsbsp_a_SOURCES += ../shared/residual/residual.c
 
 if QEMU
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 82b7b5dad8..ee027ff6fb 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index f3e80f286b..6e311eaf58 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -14,7 +14,7 @@ project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index b7ff8ea0d7..ece312c288 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -26,7 +26,7 @@ motld_start.$(OBJEXT):	preload.$(OBJEXT) vectors_entry.$(OBJEXT) \
 
 project_lib_DATA += motld_start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
@@ -39,10 +39,10 @@ librtemsbsp_a_SOURCES =
 # startup
 librtemsbsp_a_SOURCES += startup/bspstart.c
 librtemsbsp_a_SOURCES += startup/misc.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
 librtemsbsp_a_SOURCES += ../../shared/bootcard.c
 librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../shared/bspclean.c
@@ -52,24 +52,24 @@ librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 librtemsbsp_a_SOURCES += ../../shared/tod.c
 librtemsbsp_a_SOURCES += tod/todcfg.c
 # pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
 
 # openpic
-librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
 
 # pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
+librtemsbsp_a_SOURCES += ../shared/pci/pci.c
 librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../shared/pci/generic_clear_hberrs.c
+librtemsbsp_a_SOURCES += ../shared/pci/pcifinddevice.c
 
 # flash
 librtemsbsp_a_SOURCES += ../shared/flash/flash.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 4529e529a1..e14c37102b 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -15,25 +15,25 @@ librtemsbsp_a_SOURCES =
 
 # startup
 librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/pgtbl_setup.c
+librtemsbsp_a_SOURCES += ../shared/startup/pgtbl_setup.c
 librtemsbsp_a_SOURCES += startup/pgtbl_activate.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bsppredriverhook.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/zerobss.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspgetworkarea.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/bsppredriverhook.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 += ../../shared/bootcard.c
 librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += startup/bspclean.c
 librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += ../shared/startup/probeMemEnd.c
 
 # pclock
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../shared/console/uart.c
+librtemsbsp_a_SOURCES += ../shared/console/console.c
 
 # pci
 librtemsbsp_a_SOURCES += pci/pci.c
@@ -51,7 +51,7 @@ librtemsbsp_a_SOURCES += tod/todcfg.c
 
 # vectors
 librtemsbsp_a_SOURCES += vectors/exceptionhandler.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/start/vectors_entry.S
+librtemsbsp_a_SOURCES += ../shared/start/vectors_entry.S
 
 # GT64260
 librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c
@@ -63,7 +63,7 @@ librtemsbsp_a_SOURCES += network/if_1GHz/if_wm.c
 librtemsbsp_a_SOURCES += network/if_1GHz/pci_map.c
 endif
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index edb7db879b..a737b88b25 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -11,7 +11,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
@@ -28,7 +28,7 @@ librtemsbsp_a_SOURCES += startup/bspstart.c
 librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bootcard.c
 librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/sbrk.c
+librtemsbsp_a_SOURCES += ../shared/startup/sbrk.c
 librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index c6962c1350..cee0a48218 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -12,7 +12,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 1e02511420..7bdee25542 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -14,11 +14,11 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-rtems_crtn.$(OBJEXT): ../../powerpc/shared/start/rtems_crtn.S
+rtems_crtn.$(OBJEXT): ../shared/start/rtems_crtn.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crtn.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 45b31c9033..941294f7a2 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -7,7 +7,7 @@ dist_project_lib_DATA = startup/bsp_specs
 
 
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 73bac5a675..53418ddb2d 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -14,7 +14,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 8794a352d8..1e13978287 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -13,7 +13,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 40a952a017..d9db015fc3 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -16,7 +16,7 @@ start.$(OBJEXT): start/start.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = start.$(OBJEXT)
 
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index ba1e33c774..52cac756cd 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -9,7 +9,7 @@ dist_project_lib_DATA = startup/bsp_specs
 # include
 
 # start
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 3661c0fb6f..622a74d5e4 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -8,7 +8,7 @@ dist_project_lib_DATA = startup/bsp_specs
 # include
 
 # start
-rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
+rtems_crti.$(OBJEXT): ../shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA = rtems_crti.$(OBJEXT)
 
@@ -32,7 +32,7 @@ librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 librtemsbsp_a_SOURCES += start/start.S
 
 # clock & timer
-librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 
 # console
 librtemsbsp_a_SOURCES += startup/dummy_console.c