bsps: Remove librtemsbsp.a wrapup

This patch is a part of the BSP source reorganization.

Update #3285.

18 files changed, 403 insertions, 403 deletions

diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 608a036350..c300e654d7 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -40,10 +40,10 @@ project_lib_DATA += motld_start.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
-libbsp_a_SOURCES += startup/bspstart.c \
+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 \
@@ -57,28 +57,28 @@ libbsp_a_SOURCES += startup/bspstart.c \
     ../../shared/gnatinstallhandler.c
 
 #pclock
-libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 #console
-libbsp_a_SOURCES +=  \
+librtemsbsp_a_SOURCES +=  \
     ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c \
     ../../powerpc/shared/console/consoleIo.h \
     ../../powerpc/shared/console/uart.h
 
 #irq
-libbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c 
+librtemsbsp_a_SOURCES += irq/irq_init.c irq/discovery_pic.c 
 
 #marvell
-libbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c
+librtemsbsp_a_SOURCES += marvell/discovery.c marvell/gti2c.c marvell/gt_timer.c
 
 #flash
-libbsp_a_SOURCES += ../shared/flash/flash.c \
+librtemsbsp_a_SOURCES += ../shared/flash/flash.c \
     ../shared/flash/intelFlash.c \
     flash/flashcfg.c
 
 #pci
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
+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
 
@@ -147,22 +147,22 @@ network_if_em.rel: network_if_em_tmp.rel
                    -G rtems_em_pci_setup -G rtems_em_early_link_check_ops \
                    $^ $@
 
-libbsp_a_LIBADD = network_support.rel \
+librtemsbsp_a_LIBADD = network_support.rel \
     network_if_mve.rel network_if_gfe.rel network_if_em.rel
 endif
 
 # tod
-libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
-
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 900d189748..df7645d180 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -27,11 +27,11 @@ dist_project_lib_DATA += startup/linkcmds.icecube
 dist_project_lib_DATA += startup/linkcmds.pm520_cr825
 dist_project_lib_DATA += startup/linkcmds.pm520_ze30
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # bestcomm
-libbsp_a_SOURCES += bestcomm/include/ppctypes.h \
+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 \
@@ -50,19 +50,19 @@ libbsp_a_SOURCES += bestcomm/include/ppctypes.h \
     bestcomm/task_api/tasksetup_general.h
 # clock
 # clock
-libbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 # console
-libbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/console.c
 # i2c
-libbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
+librtemsbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
 # ide
-libbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/dev/mpc5200-ata.c
-libbsp_a_SOURCES += ide/ata-instance.c
-libbsp_a_SOURCES += ide/ata-dma-pio-single.c
+librtemsbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c 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
 
 # irq
-libbsp_a_SOURCES += include/irq.h \
+librtemsbsp_a_SOURCES += include/irq.h \
 	irq/irq.c \
 	../../shared/src/irq-generic.c \
 	../../shared/src/irq-legacy.c \
@@ -71,47 +71,47 @@ libbsp_a_SOURCES += include/irq.h \
 	../../shared/src/irq-server.c
 
 # mscan
-libbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
+librtemsbsp_a_SOURCES += mscan/mscan.c mscan/mscan-base.c mscan/mscan.h mscan/mscan_int.h
 
 # nvram
-libbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
+librtemsbsp_a_SOURCES += nvram/nvram.c nvram/nvram.h nvram/m93cxx.h
 
 # slicetimer
-libbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
+librtemsbsp_a_SOURCES += slicetimer/slicetimer.c slicetimer/slicetimer.h
 
 # tod
-libbsp_a_SOURCES += tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \
+librtemsbsp_a_SOURCES += tod/todcfg.c tod/pcf8563.c tod/pcf8563.h \
     ../../shared/tod.c
 
 # startup
-libbsp_a_SOURCES += ../../shared/bootcard.c
-libbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
-libbsp_a_SOURCES += ../../shared/bspclean.c
-libbsp_a_SOURCES += ../../shared/bspgetworkarea.c
-libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
-libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
-libbsp_a_SOURCES += ../../shared/sbrk.c
-libbsp_a_SOURCES += ../../shared/src/bsp-uboot-board-info.c
-libbsp_a_SOURCES += ../shared/showbats.c
-libbsp_a_SOURCES += ../shared/src/memcpy.c
-libbsp_a_SOURCES += ../shared/startup/bspidle.c
-libbsp_a_SOURCES += ../shared/uboot_dump_bdinfo.c
-libbsp_a_SOURCES += ../shared/uboot_getenv.c
-libbsp_a_SOURCES += startup/bspreset.c
-libbsp_a_SOURCES += startup/bspstart.c
-libbsp_a_SOURCES += startup/cpuinit.c 
-libbsp_a_SOURCES += startup/uboot_support.c
-libbsp_a_SOURCES += startup/bestcomm.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bspgetworkarea.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
+librtemsbsp_a_SOURCES += ../../shared/sbrk.c
+librtemsbsp_a_SOURCES += ../../shared/src/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 += ../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
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network_5200/network.c
+librtemsbsp_a_SOURCES += network_5200/network.c
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 93e936dde7..bad2b70418 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -27,11 +27,11 @@ dist_project_lib_DATA += startup/linkcmds.mpc8313erdb
 dist_project_lib_DATA += startup/linkcmds.mpc8349eamds
 dist_project_lib_DATA += startup/linkcmds.mpc83xx
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += \
+librtemsbsp_a_SOURCES += \
 	../../shared/bootcard.c \
 	../../shared/getentropy-cpucounter.c \
 	../../shared/bsppredriverhook.c \
@@ -49,39 +49,39 @@ libbsp_a_SOURCES += \
         ../shared/uboot_getenv.c
 
 # clock
-libbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 
 # irq
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-libbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 # console
-libbsp_a_SOURCES += ../../shared/console-termios-init.c
-libbsp_a_SOURCES += ../../shared/console-termios.c
-libbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../shared/console-termios.c
+librtemsbsp_a_SOURCES += console/console-config.c
 
 # bsp_i2c
-libbsp_a_SOURCES += i2c/i2c_init.c
+librtemsbsp_a_SOURCES += i2c/i2c_init.c
 # bsp_spi
-libbsp_a_SOURCES += spi/spi_init.c
+librtemsbsp_a_SOURCES += spi/spi_init.c
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/gtm.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/gtm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/network.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
+librtemsbsp_a_SOURCES += network/network.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
 
diff --git a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
index 20a75ce132..e8eb35246c 100644
--- a/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/haleakala/Makefile.am
@@ -14,11 +14,11 @@ project_lib_DATA = rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += ../../shared/bspclean.c \
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c \
     ../../shared/bspreset_loop.c \
     startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/getentropy-cpucounter.c \
@@ -27,23 +27,23 @@ libbsp_a_SOURCES += ../../shared/bspclean.c \
     ../../shared/gnatinstallhandler.c mmu/mmu_405.c mmu/mmu_405asm.S 
 
 # dlentry
-libbsp_a_SOURCES += dlentry/dlentry.S
+librtemsbsp_a_SOURCES += dlentry/dlentry.S
 
 # console
-libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c
 
 # irq
-libbsp_a_SOURCES += irq/irq_init.c irq/irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c irq/irq.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/network.c 
+librtemsbsp_a_SOURCES += network/network.c 
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index bc2e4266ac..f7feac55e0 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -31,11 +31,11 @@ project_lib_DATA += vectors_entry.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \
+librtemsbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \
  	../../powerpc/shared/startup/bspgetworkarea.c \
  	../../powerpc/shared/showbats.c \
     ../../powerpc/shared/startup/bsppredriverhook.c \
@@ -51,9 +51,9 @@ libbsp_a_SOURCES += ../../powerpc/shared/startup/bspstart.c \
 
 
 # tod
-libbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c ../../powerpc/shared/tod/todcfg.c
 # pclock
-libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # Needs conditional compilation
 polledIO_CPPFLAGS = -DSTATIC_LOG_ALLOC
@@ -63,55 +63,55 @@ polledIO_rel_CPPFLAGS = $(AM_CPPFLAGS) $(polledIO_CPPFLAGS)
 polledIO_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 # console
-libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c
-libbsp_a_SOURCES += ../../powerpc/shared/console/console.c
-libbsp_a_SOURCES += ../../powerpc/shared/console/consoleIo.h
-libbsp_a_SOURCES += ../../powerpc/shared/console/keyboard.h
-libbsp_a_SOURCES += ../../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/keyboard.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.h
 
 # irq
-libbsp_a_SOURCES += ../../powerpc/shared/irq/irq_init.c
-libbsp_a_SOURCES += ../../powerpc/shared/irq/openpic_i8259_irq.c
-libbsp_a_SOURCES += ../../powerpc/shared/irq/i8259.c
+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
 
 # motorola
-libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h
-libbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/motorola/motorola.c
 
 # openpic
-libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h
-libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.c
-libbsp_a_SOURCES += ../../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
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c
-libbsp_a_SOURCES += ../../powerpc/shared/pci/detect_raven_bridge.c
-libbsp_a_SOURCES += ../../powerpc/shared/pci/generic_clear_hberrs.c
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pcifinddevice.c
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.h
+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 += ../../powerpc/shared/pci/pci.h
 
 # residual
-libbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
-libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
-libbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/residual/pnp.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/residual/residual.h
+librtemsbsp_a_SOURCES += ../../powerpc/shared/residual/residual.c
 
 if QEMU
 if HAS_NETWORKING
-libbsp_a_SOURCES += ../../i386/pc386/ne2000/ne2000.c
+librtemsbsp_a_SOURCES += ../../i386/pc386/ne2000/ne2000.c
 endif
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
-
-libbsp_a_LIBADD = polledIO.rel
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+
+librtemsbsp_a_LIBADD = polledIO.rel
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 1d3d426edd..99caefc2fb 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -37,81 +37,81 @@ 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
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += ../../shared/bootcard.c
-libbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
-libbsp_a_SOURCES += ../../shared/bspclean.c
-libbsp_a_SOURCES += ../../shared/bsppredriverhook.c
-libbsp_a_SOURCES += ../../shared/src/stackalloc.c
-libbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
-libbsp_a_SOURCES += ../shared/src/memcpy.c
-libbsp_a_SOURCES += ../shared/src/tictac.c
-libbsp_a_SOURCES += ../shared/src/ppc-exc-handler-table.c
-libbsp_a_SOURCES += startup/bspstart.c
-libbsp_a_SOURCES += startup/bspgetworkarea.c
-libbsp_a_SOURCES += startup/exc-vector-base.S
-libbsp_a_SOURCES += startup/get-system-clock.c
-libbsp_a_SOURCES += startup/bspreset.c
-libbsp_a_SOURCES += startup/restart.c
-libbsp_a_SOURCES += startup/idle-thread.c
-libbsp_a_SOURCES += startup/start-config-clock.c
-libbsp_a_SOURCES += startup/start-config-ebi.c
-libbsp_a_SOURCES += startup/start-config-ebi-cs.c
-libbsp_a_SOURCES += startup/start-config-ebi-cs-cal.c
-libbsp_a_SOURCES += startup/start-config-mmu.c
-libbsp_a_SOURCES += startup/start-config-mmu-early.c
-libbsp_a_SOURCES += startup/start-config-siu-pcr.c
-libbsp_a_SOURCES += startup/start-prologue.c
-libbsp_a_SOURCES += startup/start-early.c
-libbsp_a_SOURCES += startup/start-cache.S
-libbsp_a_SOURCES += startup/start-clock.c
-libbsp_a_SOURCES += startup/start-flash.S
-libbsp_a_SOURCES += startup/start-watchdog.c
+librtemsbsp_a_SOURCES += ../../shared/bootcard.c
+librtemsbsp_a_SOURCES += ../../shared/getentropy-cpucounter.c
+librtemsbsp_a_SOURCES += ../../shared/bspclean.c
+librtemsbsp_a_SOURCES += ../../shared/bsppredriverhook.c
+librtemsbsp_a_SOURCES += ../../shared/src/stackalloc.c
+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
 
 # clock
-libbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES += clock/clock-config.c
 
 # console
-libbsp_a_SOURCES += console/console-config.c
-libbsp_a_SOURCES += console/console-esci.c
-libbsp_a_SOURCES += console/console-generic.c
-libbsp_a_SOURCES += console/console-linflex.c
+librtemsbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += console/console-esci.c
+librtemsbsp_a_SOURCES += console/console-generic.c
+librtemsbsp_a_SOURCES += console/console-linflex.c
 
 # irq_generic
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
 
 # Misc
-libbsp_a_SOURCES += startup/sd-card-init.c
+librtemsbsp_a_SOURCES += startup/sd-card-init.c
 
 # I2C
-libbsp_a_SOURCES += i2c/i2c_init.c
+librtemsbsp_a_SOURCES += i2c/i2c_init.c
 
 # Network
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/smsc9218i.c
-libbsp_a_SOURCES += network/if_smc.c
+librtemsbsp_a_SOURCES += network/smsc9218i.c
+librtemsbsp_a_SOURCES += network/if_smc.c
 endif
 
 # BSP library
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/dev/dspi.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/copy.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/edma.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/emios.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/flash_support.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/irq.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/siu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/dev/dspi.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/copy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/edma.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/emios.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/flash_support.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/siu.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index 3f653e54d5..e9f12b7423 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -19,45 +19,45 @@ rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
 	$(CPPASCOMPILE) -o $@ -c $<
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # clock
-libbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 
 # console
-libbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/console.c
 
 # irq
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-libbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 # startup
-libbsp_a_SOURCES += ../../shared/bspclean.c \
+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
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/if_hdlcsubr.c
-libbsp_a_SOURCES += network/network.c
+librtemsbsp_a_SOURCES += network/if_hdlcsubr.c
+librtemsbsp_a_SOURCES += network/network.c
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/dev/console-generic.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/brg.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/cp.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/dpram.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/mmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/dev/console-generic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/brg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/cp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/dpram.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc8260ads/start/mmu.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 337211a084..dca2b3bee3 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -34,11 +34,11 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += startup/bspstart.c \
+librtemsbsp_a_SOURCES += startup/bspstart.c \
     startup/misc.c ../../powerpc/shared/startup/bspgetworkarea.c \
     ../../powerpc/shared/startup/bsppredriverhook.c \
     ../../powerpc/shared/startup/zerobss.c \
@@ -46,53 +46,53 @@ libbsp_a_SOURCES += startup/bspstart.c \
     ../../shared/getentropy-cpucounter.c \
     ../../shared/bspclean.c \
     ../../shared/gnatinstallhandler.c
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # tod
-libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
 # pclock
-libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c \
     ../../powerpc/shared/console/consoleIo.h \
     ../../powerpc/shared/console/uart.h
 
 # irq
-libbsp_a_SOURCES += irq/irq_init.c \
+librtemsbsp_a_SOURCES += irq/irq_init.c \
     ../../powerpc/shared/irq/openpic_i8259_irq.c
 
 # openpic
-libbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
+librtemsbsp_a_SOURCES += ../../powerpc/shared/openpic/openpic.h \
     ../../powerpc/shared/openpic/openpic.c \
     ../../powerpc/shared/openpic/openpic.h
 
 # pci
-libbsp_a_SOURCES += ../../powerpc/shared/pci/pci.c \
+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
 
 # flash
-libbsp_a_SOURCES += ../shared/flash/flash.c \
+librtemsbsp_a_SOURCES += ../shared/flash/flash.c \
     ../shared/flash/spansionFlash.c \
     flash/flashcfg.c
 
 # i2c
-libbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
+librtemsbsp_a_SOURCES += i2c/mpc8540_i2c.c i2c/i2c_init.c
 
 # vpd
-libbsp_a_SOURCES += ../shared/motorola/vpd.c
+librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/tsec.c
+librtemsbsp_a_SOURCES += network/tsec.c
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 42bcd70394..4a0220bb11 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -9,13 +9,13 @@ DISTCLEANFILES = include/bspopts.h
 
 noinst_PROGRAMS =
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # UNUSED
 
 # startup
-libbsp_a_SOURCES += startup/bspstart.c \
+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 \
@@ -27,30 +27,30 @@ libbsp_a_SOURCES += startup/bspstart.c \
     ../../powerpc/shared/startup/probeMemEnd.c
 
 # pclock
-libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-libbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
+librtemsbsp_a_SOURCES += ../../powerpc/shared/console/uart.c \
     ../../powerpc/shared/console/console.c
 
 # pci
-libbsp_a_SOURCES += pci/pci.c
-libbsp_a_SOURCES += pci/pci_interface.c
-libbsp_a_SOURCES += pci/detect_host_bridge.c
-libbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
+librtemsbsp_a_SOURCES += pci/pci.c
+librtemsbsp_a_SOURCES += pci/pci_interface.c
+librtemsbsp_a_SOURCES += pci/detect_host_bridge.c
+librtemsbsp_a_SOURCES += ../../shared/pci/pci_find_device.c
 
 # irq
-libbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c
+librtemsbsp_a_SOURCES += irq/irq_init.c irq/BSP_irq.c
 
 # tod
-libbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../shared/tod.c tod/todcfg.c
 
 # vectors
-libbsp_a_SOURCES += vectors/exceptionhandler.c \
+librtemsbsp_a_SOURCES += vectors/exceptionhandler.c \
     ../../powerpc/shared/start/vectors_entry.S
 
 # GT64260
-libbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
+librtemsbsp_a_SOURCES += GT64260/GT64260TWSI.c GT64260/MVME5500I2C.c
 
 if HAS_NETWORKING
 network_CPPFLAGS = -D_KERNEL -D__BSD_VISIBLE
@@ -59,7 +59,7 @@ network_rel_SOURCES = network/if_100MHz/GT64260eth.c \
     network/if_1GHz/if_wm.c network/if_1GHz/pci_map.c
 network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-libbsp_a_LIBADD = network.rel
+librtemsbsp_a_LIBADD = network.rel
 endif
 
 rtems_crti.$(OBJEXT): ../../powerpc/shared/start/rtems_crti.S
@@ -76,15 +76,15 @@ project_lib_DATA += mvme5500start.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.share
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 46b2f561ef..af17d3c861 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -19,51 +19,51 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # startup
-libbsp_a_SOURCES += ../../shared/bspclean.c \
+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
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # pclock
-libbsp_a_SOURCES += ../shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/p_clock.c
 # console
-libbsp_a_SOURCES += ../../shared/console-polled.c
+librtemsbsp_a_SOURCES += ../../shared/console-polled.c
 # debugio
-libbsp_a_SOURCES += console/console-io.c console/consupp.S
+librtemsbsp_a_SOURCES += console/console-io.c console/consupp.S
 
 # irq
-libbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \
+librtemsbsp_a_SOURCES += irq/irq_init.c ../shared/irq/openpic_i8259_irq.c \
     ../shared/openpic/openpic.c ../../shared/src/irq-server.c  \
     ../../shared/src/irq-generic.c ../../shared/src/irq-default-handler.c
 
 # vectors
-libbsp_a_SOURCES += vectors/align_h.S
+librtemsbsp_a_SOURCES += vectors/align_h.S
 
 if HAS_MP
 # shmdr
-libbsp_a_SOURCES += \
+librtemsbsp_a_SOURCES += \
     shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c shmsupp/mpisr.c
 endif
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/if_sim.c
+librtemsbsp_a_SOURCES += network/if_sim.c
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
index 35dc9e3bd5..d3d7cfd7a0 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qemuppc/Makefile.am
@@ -44,15 +44,15 @@ irq_SOURCES += ../../shared/src/irq-server.c
 irq_SOURCES += ../../shared/src/irq-shell.c
 irq_SOURCES += irq/irq_init.c
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \
     $(irq_SOURCES)
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/bat.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/mmuAsm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/pte121.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index bde6654a24..167387cdde 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -31,11 +31,11 @@ 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
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # Startup
-libbsp_a_SOURCES += \
+librtemsbsp_a_SOURCES += \
 	../../shared/bootcard.c \
 	../../shared/getentropy-cpucounter.c \
 	../../shared/sbrk.c \
@@ -60,48 +60,48 @@ libbsp_a_SOURCES += \
 	startup/bsprestart.c
 
 # Clock
-libbsp_a_SOURCES += clock/clock-config.c \
+librtemsbsp_a_SOURCES += clock/clock-config.c \
 	../../shared/clockdrv_shell.h
 
 # Timer
-libbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timer.c
 
 # IRQ
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-libbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-libbsp_a_SOURCES += ../../shared/console-termios-init.c
-libbsp_a_SOURCES += ../../shared/console-termios.c
-libbsp_a_SOURCES += console/uart-bridge-master.c
-libbsp_a_SOURCES += console/uart-bridge-slave.c
-libbsp_a_SOURCES += console/console-config.c
+librtemsbsp_a_SOURCES += ../../shared/console-termios-init.c
+librtemsbsp_a_SOURCES += ../../shared/console-termios.c
+librtemsbsp_a_SOURCES += console/uart-bridge-master.c
+librtemsbsp_a_SOURCES += console/uart-bridge-slave.c
+librtemsbsp_a_SOURCES += console/console-config.c
 
 # RTC
-libbsp_a_SOURCES += ../../shared/tod.c \
+librtemsbsp_a_SOURCES += ../../shared/tod.c \
 	rtc/rtc-config.c
 
 # MPCI
-libbsp_a_SOURCES += shmsupp/lock.S \
+librtemsbsp_a_SOURCES += shmsupp/lock.S \
 	shmsupp/intercom.c \
 	shmsupp/intercom-mpci.c
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/mmu/e500-mmu.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/network.c \
+librtemsbsp_a_SOURCES += network/network.c \
 	network/if_intercom.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/net/tsec.c
 endif
 
 if HAS_SMP
-libbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += startup/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 417f3e46f0..672d828921 100644
--- a/c/src/lib/libbsp/powerpc/ss555/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/ss555/Makefile.am
@@ -14,35 +14,35 @@ project_lib_DATA = rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # pclock
-libbsp_a_SOURCES += clock/p_clock.c
+librtemsbsp_a_SOURCES += clock/p_clock.c
 # console
-libbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/console.c
 # startup
-libbsp_a_SOURCES += ../../shared/bspclean.c \
+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
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 # tm27supp
-libbsp_a_SOURCES += startup/tm27supp.c
-
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_print.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/clock.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/console-generic.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq_asm.S
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq_init.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/raw_exception.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors_init.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors.S
+librtemsbsp_a_SOURCES += startup/tm27supp.c
+
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_print.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/clock.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/console-generic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq_asm.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/raw_exception.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/vectors.S
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
index 83e0977ab4..df7fe97ebe 100644
--- a/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
@@ -23,11 +23,11 @@ project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
 dist_project_lib_DATA += startup/linkcmds.t32mppc
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # Startup
-libbsp_a_SOURCES += \
+librtemsbsp_a_SOURCES += \
 	../../shared/bootcard.c \
 	../../shared/getentropy-cpucounter.c \
 	../../shared/bsppredriverhook.c \
@@ -42,28 +42,28 @@ libbsp_a_SOURCES += \
 	startup/bspreset.c
 
 # Clock
-libbsp_a_SOURCES += clock/clock-config.c
+librtemsbsp_a_SOURCES += clock/clock-config.c
 
 # Timer
-libbsp_a_SOURCES += ../../shared/timerstub.c
+librtemsbsp_a_SOURCES += ../../shared/timerstub.c
 
 # IRQ
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-libbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 # Console
-libbsp_a_SOURCES += ../../shared/console-termios.c
-libbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += ../../shared/console-termios.c
+librtemsbsp_a_SOURCES += console/console.c
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
 
 if HAS_SMP
-libbsp_a_SOURCES += ../../shared/bspsmp.c
+librtemsbsp_a_SOURCES += ../../shared/bspsmp.c
 endif
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
index 1018c62cea..b99e385687 100644
--- a/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am
@@ -21,49 +21,49 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
 
 # irq
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-libbsp_a_SOURCES += irq/irq.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += irq/irq.c
 
 # clock
-libbsp_a_SOURCES += ../shared/clock/clock.c
-libbsp_a_SOURCES += clock/p_clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES += clock/p_clock.c
 
 # console
-libbsp_a_SOURCES += console/console.c
+librtemsbsp_a_SOURCES += console/console.c
 # spi
-libbsp_a_SOURCES += spi/spi.c
+librtemsbsp_a_SOURCES += spi/spi.c
 # timer
-libbsp_a_SOURCES += timer/timer.c
+librtemsbsp_a_SOURCES += timer/timer.c
 # startup
-libbsp_a_SOURCES += ../../shared/bspclean.c \
+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
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += network/network_fec.c
-libbsp_a_SOURCES += network/network_scc.c
+librtemsbsp_a_SOURCES += network/network_fec.c
+librtemsbsp_a_SOURCES += network/network_scc.c
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/dev/console-generic.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/cp.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/dpram.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmu.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/dev/console-generic.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/cp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/dpram.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/tqm8xx/start/mmu.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index 8c1cc59869..72daf0c5ca 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -25,42 +25,42 @@ project_lib_DATA += rtems_crti.$(OBJEXT)
 project_lib_DATA += linkcmds
 dist_project_lib_DATA += ../shared/startup/linkcmds.base
 
-noinst_LIBRARIES = libbsp.a
-libbsp_a_SOURCES =
-libbsp_a_LIBADD =
+project_lib_LIBRARIES = librtemsbsp.a
+librtemsbsp_a_SOURCES =
+librtemsbsp_a_LIBADD =
 
 # startup
-libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bspgetworkarea.c \
+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
-libbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
 
 # bspconsole
-libbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
+librtemsbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
     ../../shared/console_select.c ../../shared/console_control.c \
     ../../shared/console_read.c ../../shared/console_write.c 
 
 # irq
-libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
-libbsp_a_SOURCES += ../../shared/src/irq-generic.c
-libbsp_a_SOURCES += ../../shared/src/irq-info.c
-libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
-libbsp_a_SOURCES += ../../shared/src/irq-server.c
-libbsp_a_SOURCES += ../../shared/src/irq-shell.c
-libbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-generic.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-info.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-legacy.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-server.c
+librtemsbsp_a_SOURCES += ../../shared/src/irq-shell.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
 
 # clock
-libbsp_a_SOURCES += ../shared/clock/clock.c
+librtemsbsp_a_SOURCES += ../shared/clock/clock.c
 
 if HAS_NETWORKING
-libbsp_a_SOURCES += = network/xiltemac.c
+librtemsbsp_a_SOURCES += = network/xiltemac.c
 endif
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
 
 include $(top_srcdir)/../../../../automake/local.am
 include $(srcdir)/../../../../../../bsps/shared/shared-sources.am
diff --git a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
index 0579137199..576dba2c00 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex4/Makefile.am
@@ -16,10 +16,10 @@ project_lib_DATA = rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
 
-noinst_LIBRARIES = libbsp.a
+project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-libbsp_a_SOURCES = startup/bspclean.c \
+librtemsbsp_a_SOURCES = startup/bspclean.c \
                    ../shared/startup/zerobss.c \
                    ../../shared/bspgetworkarea.c \
                    startup/bspstart.c \
@@ -28,24 +28,24 @@ libbsp_a_SOURCES = startup/bspclean.c \
                    ../../shared/sbrk.c \
                    ../../shared/gnatinstallhandler.c \
                    ../shared/src/memcpy.c
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # start
-libbsp_a_SOURCES += start/start.S
+librtemsbsp_a_SOURCES += start/start.S
 
 # console
-libbsp_a_SOURCES += startup/dummy_console.c \
+librtemsbsp_a_SOURCES += startup/dummy_console.c \
                     ../../shared/dummy_printk_support.c
 
 # irq
-libbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
 
 # mmu
-libbsp_a_SOURCES += mmu/mmu.c
+librtemsbsp_a_SOURCES += mmu/mmu.c
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc403.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
 
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
index 4089cdbac3..89eb3c15d7 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex5/Makefile.am
@@ -15,10 +15,10 @@ project_lib_DATA = rtems_crti.$(OBJEXT)
 
 project_lib_DATA += linkcmds
 
-noinst_LIBRARIES = libbsp.a
+project_lib_LIBRARIES = librtemsbsp.a
 
 # startup
-libbsp_a_SOURCES = startup/bspclean.c \
+librtemsbsp_a_SOURCES = startup/bspclean.c \
                    ../shared/startup/zerobss.c \
                    ../../shared/bspgetworkarea.c \
                    startup/bspstart.c \
@@ -27,27 +27,27 @@ libbsp_a_SOURCES = startup/bspclean.c \
                    ../../shared/sbrk.c \
                    ../../shared/gnatinstallhandler.c \
                    ../shared/src/memcpy.c
-libbsp_a_SOURCES += ../../shared/bspreset.c
+librtemsbsp_a_SOURCES += ../../shared/bspreset.c
 
 # start
-libbsp_a_SOURCES += start/start.S
+librtemsbsp_a_SOURCES += start/start.S
 
 # clock & timer
-libbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
+librtemsbsp_a_SOURCES += ../../powerpc/shared/clock/p_clock.c
 
 # console
-libbsp_a_SOURCES += startup/dummy_console.c \
+librtemsbsp_a_SOURCES += startup/dummy_console.c \
                     ../../shared/dummy_printk_support.c
 
 # irq
-libbsp_a_SOURCES += irq/irq_init.c
+librtemsbsp_a_SOURCES += irq/irq_init.c
 
 # mmu
-libbsp_a_SOURCES += mmu/mmu.c
+librtemsbsp_a_SOURCES += mmu/mmu.c
 
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
-libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/clock-ppc-dec.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/dev/timer-ppc-dec.c
 
 
 include $(top_srcdir)/../../../../automake/local.am