bsps: Avoid line continuation in Makefile.am

This patch is a part of the BSP source reorganization.

Update #3285.

17 files changed, 317 insertions, 239 deletions

diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 74e1c8fea1..cc7a004c8c 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -41,44 +41,51 @@ dist_project_lib_DATA += ../shared/startup/linkcmds.share
 project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
-librtemsbsp_a_SOURCES += startup/bspstart.c \
-    ../shared/motorola/vpd.c startup/bspreset.c startup/i2c_init.c \
-    ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/probeMemEnd.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
-    ../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c \
-    ../../powerpc/shared/startup/pgtbl_activate.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/bspclean.c \
-    ../../shared/gnatinstallhandler.c
+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/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
 
 #console
-librtemsbsp_a_SOURCES +=  \
-    ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c \
-    ../../powerpc/shared/console/consoleIo.h \
-    ../../powerpc/shared/console/uart.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
 #irq
-librtemsbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c 
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/discovery_pic.c 
 
 #marvell
-librtemsbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c
+librtemsbsp_a_SOURCES += marvell/discovery.c
+librtemsbsp_a_SOURCES += marvell/gti2c.c
+librtemsbsp_a_SOURCES += marvell/gt_timer.c
 
 #flash
-librtemsbsp_a_SOURCES += ../shared/flash/flash.c \
-    ../shared/flash/intelFlash.c \
-    flash/flashcfg.c
+librtemsbsp_a_SOURCES += ../shared/flash/flash.c
+librtemsbsp_a_SOURCES += ../shared/flash/intelFlash.c
+librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 #pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
-    pci/gt_pci_init.c pci/pci_io_remap.c pci/motload_fixup.c \
-    ../../powerpc/shared/pci/pcifinddevice.c
+librtemsbsp_a_SOURCES += ../../powerpc/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
 
 #network
 if HAS_NETWORKING
@@ -93,7 +100,8 @@ librtemsbsp_a_SOURCES += network/support/early_link_status.c
 endif
 
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
 
 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/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 8c2630f9a9..1ca8e629c1 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -30,32 +30,54 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # bestcomm
-librtemsbsp_a_SOURCES += bestcomm/include/ppctypes.h \
-    bestcomm/include/mgt5200/mgt5200.h bestcomm/include/mgt5200/sdma.h \
-    bestcomm/bestcomm_api.c bestcomm/bestcomm_api.h bestcomm/bestcomm_glue.c \
-    bestcomm/bestcomm_glue.h bestcomm/dma_image.c bestcomm/dma_image.capi.h \
-    bestcomm/dma_image.h bestcomm/dma_image.reloc.c bestcomm/load_task.c \
-    bestcomm/tasksetup_ata.c bestcomm/tasksetup_bdtable.c \
-    bestcomm/tasksetup_crc16_dp_0.c bestcomm/tasksetup_crc16_dp_1.c \
-    bestcomm/tasksetup_fec_rx_bd.c bestcomm/tasksetup_fec_tx_bd.c \
-    bestcomm/tasksetup_gen_dp_0.c bestcomm/tasksetup_gen_dp_1.c \
-    bestcomm/tasksetup_gen_dp_2.c bestcomm/tasksetup_gen_dp_3.c \
-    bestcomm/tasksetup_gen_dp_bd_0.c bestcomm/tasksetup_gen_dp_bd_1.c \
-    bestcomm/tasksetup_gen_rx_bd.c bestcomm/tasksetup_gen_tx_bd.c \
-    bestcomm/tasksetup_lpc.c bestcomm/tasksetup_pci_rx.c \
-    bestcomm/tasksetup_pci_tx.c bestcomm/bestcomm_priv.h \
-    bestcomm/task_api/bestcomm_api_mem.h bestcomm/task_api/bestcomm_cntrl.h \
-    bestcomm/task_api/tasksetup_bdtable.h \
-    bestcomm/task_api/tasksetup_general.h
+librtemsbsp_a_SOURCES += bestcomm/include/ppctypes.h
+librtemsbsp_a_SOURCES += bestcomm/include/mgt5200/mgt5200.h
+librtemsbsp_a_SOURCES += bestcomm/include/mgt5200/sdma.h
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_api.c
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_api.h
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_glue.c
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_glue.h
+librtemsbsp_a_SOURCES += bestcomm/dma_image.c
+librtemsbsp_a_SOURCES += bestcomm/dma_image.capi.h
+librtemsbsp_a_SOURCES += bestcomm/dma_image.h
+librtemsbsp_a_SOURCES += bestcomm/dma_image.reloc.c
+librtemsbsp_a_SOURCES += bestcomm/load_task.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_ata.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_bdtable.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_crc16_dp_0.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_crc16_dp_1.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_fec_rx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_fec_tx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_0.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_1.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_2.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_3.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_bd_0.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_dp_bd_1.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_rx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_gen_tx_bd.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_lpc.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_rx.c
+librtemsbsp_a_SOURCES += bestcomm/tasksetup_pci_tx.c
+librtemsbsp_a_SOURCES += bestcomm/bestcomm_priv.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/bestcomm_api_mem.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/bestcomm_cntrl.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/tasksetup_bdtable.h
+librtemsbsp_a_SOURCES += bestcomm/task_api/tasksetup_general.h
 # clock
 # clock
 librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # i2c
-librtemsbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
+librtemsbsp_a_SOURCES += i2c/i2c.c
+librtemsbsp_a_SOURCES += i2c/i2cdrv.c
+librtemsbsp_a_SOURCES += i2c/mpc5200mbus.c
+librtemsbsp_a_SOURCES += i2c/mpc5200mbus.h
 # ide
-librtemsbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h
+librtemsbsp_a_SOURCES += ide/idecfg.c
+librtemsbsp_a_SOURCES += ide/pcmcia_ide.c
+librtemsbsp_a_SOURCES += ide/pcmcia_ide.h
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/dev/mpc5200-ata.c
 librtemsbsp_a_SOURCES += ide/ata-instance.c
 librtemsbsp_a_SOURCES += ide/ata-dma-pio-single.c
@@ -64,17 +86,25 @@ librtemsbsp_a_SOURCES += ide/ata-dma-pio-single.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # mscan
-librtemsbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
+librtemsbsp_a_SOURCES += mscan/mscan.c
+librtemsbsp_a_SOURCES += mscan/mscan-base.c
+librtemsbsp_a_SOURCES += mscan/mscan.h
+librtemsbsp_a_SOURCES += mscan/mscan_int.h
 
 # nvram
-librtemsbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
+librtemsbsp_a_SOURCES += nvram/nvram.c
+librtemsbsp_a_SOURCES += nvram/nvram.h
+librtemsbsp_a_SOURCES += nvram/m93cxx.h
 
 # slicetimer
-librtemsbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
+librtemsbsp_a_SOURCES += slicetimer/slicetimer.c
+librtemsbsp_a_SOURCES += slicetimer/slicetimer.h
 
 # tod
-librtemsbsp_a_SOURCES += tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \
-    ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
+librtemsbsp_a_SOURCES += tod/pcf8563.c
+librtemsbsp_a_SOURCES += tod/pcf8563.h
+librtemsbsp_a_SOURCES += ../../shared/tod.c
 
 # startup
 librtemsbsp_a_SOURCES += ../../shared/bootcard.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 1ade7ccc28..a3ece5d493 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -30,22 +30,21 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += \
-	../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bsppredriverhook.c \
-	../../shared/sbrk.c \
-	../../shared/gnatinstallhandler.c \
-	../shared/src/tictac.c \
-	startup/cpuinit.c \
-	../shared/startup/bspidle.c \
-	startup/bspstart.c \
-	../../shared/bspclean.c \
-	startup/bspreset.c \
-	startup/bsprestart.c \
-	../../shared/bspgetworkarea.c \
-        ../../shared/src/bsp-uboot-board-info.c \
-        ../shared/uboot_getenv.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.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 += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/bsprestart.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/src/bsp-uboot-board-info.c
+librtemsbsp_a_SOURCES += ../shared/uboot_getenv.c
 
 # clock
 librtemsbsp_a_SOURCES += ../shared/clock/clock.c
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 67ee7d3d09..b4af09af38 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -17,23 +17,28 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bspreset_loop.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
-    ../../shared/sbrk.c \
-    ../../shared/gnatinstallhandler.c mmu/mmu_405.c mmu/mmu_405asm.S 
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += mmu/mmu_405.c
+librtemsbsp_a_SOURCES += mmu/mmu_405asm.S 
 
 # dlentry
 librtemsbsp_a_SOURCES += dlentry/dlentry.S
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c irq/irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/network.c 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 4fd24a3978..f080f82525 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -34,23 +34,25 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \
- 	../../powerpc/shared/startup/bspgetworkarea.c \
- 	../../powerpc/shared/showbats.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
- 	../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c \
-    ../../powerpc/shared/startup/pgtbl_activate.c \
-	../../powerpc/shared/startup/ppc_idle.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bspclean.c \
-    ../../shared/gnatinstallhandler.c \
-    startup/bspreset.c
+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/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
 
 
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/tod/todcfg.c
 # pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index e66b7bf64f..f3e80f286b 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -32,12 +32,16 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += irq/irq.c
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../shared/startup/bspidle.c startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c \
-    ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 6f67d60a9f..c91dba24e0 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -37,48 +37,53 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c \
-    startup/misc.c ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
-    ../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bspclean.c \
-    ../../shared/gnatinstallhandler.c
+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/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
 # pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c \
-    ../../powerpc/shared/console/consoleIo.h \
-    ../../powerpc/shared/console/uart.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c \
-    ../../powerpc/shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
 
 # openpic
-librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
-    ../../powerpc/shared/openpic/openpic.c \
-    ../../powerpc/shared/openpic/openpic.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
 
 # pci
-librtemsbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
-    pci/detect_host_bridge.c \
-    ../../powerpc/shared/pci/generic_clear_hberrs.c \
-    ../../powerpc/shared/pci/pcifinddevice.c ../../powerpc/shared/pci/pci.h
+librtemsbsp_a_SOURCES += ../../powerpc/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 += ../../powerpc/shared/pci/pci.h
 
 # flash
-librtemsbsp_a_SOURCES += ../shared/flash/flash.c \
-    ../shared/flash/spansionFlash.c \
-    flash/flashcfg.c
+librtemsbsp_a_SOURCES += ../shared/flash/flash.c
+librtemsbsp_a_SOURCES += ../shared/flash/spansionFlash.c
+librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 # i2c
-librtemsbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
+librtemsbsp_a_SOURCES += i2c/mpc8540_i2c.c
+librtemsbsp_a_SOURCES += i2c/i2c_init.c
 
 # vpd
 librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 8df589780e..4529e529a1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -14,23 +14,26 @@ librtemsbsp_a_SOURCES =
 # UNUSED
 
 # startup
-librtemsbsp_a_SOURCES += startup/bspstart.c \
-    ../../powerpc/shared/startup/pgtbl_setup.c startup/pgtbl_activate.c \
-    ../../powerpc/shared/startup/bsppredriverhook.c \
-    ../../powerpc/shared/startup/zerobss.c \
-    ../../powerpc/shared/startup/bspgetworkarea.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/bspclean.c \
-    ../../shared/gnatinstallhandler.c startup/bspreset.c \
-    ../../powerpc/shared/startup/probeMemEnd.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../powerpc/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/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
 
 # pclock
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
-    ../../powerpc/shared/console/console.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/console.c
 
 # pci
 librtemsbsp_a_SOURCES += pci/pci.c
@@ -39,17 +42,20 @@ librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
 librtemsbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/BSP_irq.c
 
 # tod
-librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += tod/todcfg.c
 
 # vectors
-librtemsbsp_a_SOURCES += vectors/exceptionhandler.c \
-    ../../powerpc/shared/start/vectors_entry.S
+librtemsbsp_a_SOURCES += vectors/exceptionhandler.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/start/vectors_entry.S
 
 # GT64260
-librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
+librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c
+librtemsbsp_a_SOURCES += GT64260/MVME5500I2C.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += network/if_100MHz/GT64260eth.c
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index f526bc296c..edb7db879b 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -22,11 +22,14 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c startup/bspstart.c \
-    ../../shared/bspgetworkarea.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+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/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # pclock
@@ -34,20 +37,24 @@ librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 # console
 librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 # debugio
-librtemsbsp_a_SOURCES += console/console-io.c console/consupp.S
+librtemsbsp_a_SOURCES += console/console-io.c
+librtemsbsp_a_SOURCES += console/consupp.S
 
 # irq
-librtemsbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \
-    ../shared/openpic/openpic.c \
-    ../../../../../../bsps/shared/irq/irq-default-handler.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../shared/irq/openpic_i8259_irq.c
+librtemsbsp_a_SOURCES += ../shared/openpic/openpic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 
 # vectors
 librtemsbsp_a_SOURCES += vectors/align_h.S
 
 if HAS_MP
 # shmdr
-librtemsbsp_a_SOURCES += \
-    shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
+librtemsbsp_a_SOURCES += shmsupp/addrconv.c
+librtemsbsp_a_SOURCES += shmsupp/getcfg.c
+librtemsbsp_a_SOURCES += shmsupp/lock.c
+librtemsbsp_a_SOURCES += shmsupp/mpisr.c
 endif
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 56ffc9272b..798da5bc45 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -39,8 +39,10 @@ irq_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 irq_SOURCES += irq/irq_init.c
 
 project_lib_LIBRARIES = librtemsbsp.a
-librtemsbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
-    $(irq_SOURCES)
+librtemsbsp_a_SOURCES = $(startup_SOURCES)
+librtemsbsp_a_SOURCES += $(clock_SOURCES)
+librtemsbsp_a_SOURCES += $(console_SOURCES)
+librtemsbsp_a_SOURCES += $(irq_SOURCES)
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index d4a6109a7b..838c2b43b1 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -34,33 +34,32 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # Startup
-librtemsbsp_a_SOURCES += \
-	../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/sbrk.c \
-	../../shared/gnatinstallhandler.c \
-	../../shared/bspclean.c \
-	../../shared/src/bsp-fdt.c \
-	../shared/src/ppc-exc-handler-table.c \
-	../shared/src/tictac.c \
-	../shared/src/bsp-start-zero.S \
-	../shared/startup/bspidle.c \
-	startup/epapr_hcalls.S \
-	startup/l1cache.S \
-	startup/l2cache.S \
-	startup/mmu.c \
-	startup/mmu-tlb1.S \
-	startup/mmu-config.c \
-	startup/portal.c \
-	startup/restart.S \
-	startup/bsppredriverhook.c \
-	startup/bspstart.c \
-	startup/bspreset.c \
-	startup/bsprestart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/src/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/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
+librtemsbsp_a_SOURCES += startup/bsprestart.c
 
 # Clock
-librtemsbsp_a_SOURCES += clock/clock-config.c \
-	../../shared/clockdrv_shell.h
+librtemsbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES += ../../shared/clockdrv_shell.h
 
 # Timer
 librtemsbsp_a_SOURCES += timer/timer.c
@@ -77,20 +76,20 @@ librtemsbsp_a_SOURCES += console/uart-bridge-slave.c
 librtemsbsp_a_SOURCES += console/console-config.c
 
 # RTC
-librtemsbsp_a_SOURCES += ../../shared/tod.c \
-	rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c
+librtemsbsp_a_SOURCES += rtc/rtc-config.c
 
 # MPCI
-librtemsbsp_a_SOURCES += shmsupp/lock.S \
-	shmsupp/intercom.c \
-	shmsupp/intercom-mpci.c
+librtemsbsp_a_SOURCES += shmsupp/lock.S
+librtemsbsp_a_SOURCES += shmsupp/intercom.c
+librtemsbsp_a_SOURCES += shmsupp/intercom-mpci.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += network/network.c \
-	network/if_intercom.c
+librtemsbsp_a_SOURCES += network/network.c
+librtemsbsp_a_SOURCES += network/if_intercom.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
diff --git a/c/src/lib/libbsp/powerpc/ss555/Makefile.am b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
index 7044951bcb..45b31c9033 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -21,12 +21,16 @@ librtemsbsp_a_SOURCES += clock/p_clock.c
 # console
 librtemsbsp_a_SOURCES += console/console.c
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    startup/bspstart.c ../../shared/bootcard.c startup/iss555.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c start/start.S \
-    ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += startup/iss555.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += start/start.S
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # tm27supp
 librtemsbsp_a_SOURCES += startup/tm27supp.c
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 4808622283..73bac5a675 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -26,19 +26,18 @@ project_lib_LIBRARIES = librtemsbsp.a
 librtemsbsp_a_SOURCES =
 
 # Startup
-librtemsbsp_a_SOURCES += \
-	../../shared/bootcard.c \
-	../../shared/getentropy-cpucounter.c \
-	../../shared/bsppredriverhook.c \
-	../../shared/sbrk.c \
-	../../shared/gnatinstallhandler.c \
-	../../shared/bspclean.c \
-	../../shared/bspgetworkarea.c \
-	../shared/src/ppc-exc-handler-table.c \
-	../shared/src/tictac.c \
-	../shared/src/bsp-start-zero.S \
-	startup/bspstart.c \
-	startup/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.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 += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspreset.c
 
 # Clock
 librtemsbsp_a_SOURCES += 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 182e74d945..8794a352d8 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -38,13 +38,17 @@ librtemsbsp_a_SOURCES += spi/spi.c
 # timer
 librtemsbsp_a_SOURCES += timer/timer.c
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
-    ../../shared/bsppredriverhook.c \
-    ../shared/startup/bspidle.c \
-    startup/bspstart.c startup/bspgetworkarea.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    startup/mmutlbtab.c startup/cpuinit.c ../../shared/sbrk.c \
-    ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../shared/startup/bspidle.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += startup/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += startup/mmutlbtab.c
+librtemsbsp_a_SOURCES += startup/cpuinit.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 00ddcda792..40a952a017 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -29,12 +29,15 @@ librtemsbsp_a_SOURCES =
 librtemsbsp_a_LIBADD =
 
 # startup
-librtemsbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bspgetworkarea.c \
-    ../../shared/bspreset_loop.c \
-    startup/bspstart.c ../../shared/bootcard.c \
-    ../../shared/getentropy-cpucounter.c \
-    ../../shared/bsppredriverhook.c \
-    ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset_loop.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
 
 # bspconsole
@@ -51,7 +54,8 @@ librtemsbsp_a_SOURCES += irq/irq_init.c
 librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 
 if HAS_NETWORKING
-librtemsbsp_a_SOURCES += = network/xiltemac.c
+librtemsbsp_a_SOURCES += =
+librtemsbsp_a_SOURCES += network/xiltemac.c
 endif
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 2731b9ec4b..ba1e33c774 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -18,23 +18,23 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = startup/bspclean.c \
-                   ../shared/startup/zerobss.c \
-                   ../../shared/bspgetworkarea.c \
-                   startup/bspstart.c \
-                   ../../shared/bootcard.c \
-                   ../../shared/getentropy-cpucounter.c \
-                   ../../shared/sbrk.c \
-                   ../../shared/gnatinstallhandler.c \
-                   ../shared/src/memcpy.c
+librtemsbsp_a_SOURCES = startup/bspclean.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # start
 librtemsbsp_a_SOURCES += start/start.S
 
 # console
-librtemsbsp_a_SOURCES += startup/dummy_console.c \
-                    ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += startup/dummy_console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 63718cdcaf..3661c0fb6f 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -17,15 +17,15 @@ project_lib_DATA += linkcmds
 project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-librtemsbsp_a_SOURCES = startup/bspclean.c \
-                   ../shared/startup/zerobss.c \
-                   ../../shared/bspgetworkarea.c \
-                   startup/bspstart.c \
-                   ../../shared/bootcard.c \
-                   ../../shared/getentropy-cpucounter.c \
-                   ../../shared/sbrk.c \
-                   ../../shared/gnatinstallhandler.c \
-                   ../shared/src/memcpy.c
+librtemsbsp_a_SOURCES = startup/bspclean.c
+librtemsbsp_a_SOURCES += ../shared/startup/zerobss.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += startup/bspstart.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../shared/src/memcpy.c
 librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # start
@@ -35,8 +35,8 @@ librtemsbsp_a_SOURCES += start/start.S
 librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-librtemsbsp_a_SOURCES += startup/dummy_console.c \
-                    ../../shared/dummy_printk_support.c
+librtemsbsp_a_SOURCES += startup/dummy_console.c
+librtemsbsp_a_SOURCES += ../../shared/dummy_printk_support.c
 
 # irq
 librtemsbsp_a_SOURCES += irq/irq_init.c