Index: c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
===================================================================
--- c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am	(revision b80be1355033e59de3cc3eab418a4b6dc66d4a83)
+++ c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am	(revision 3460c5228637b784edf68011d0e15d3f65517d61)
@@ -44,5 +44,5 @@
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bsp-start-zero.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/memcpy.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/tictac.c
Index: c/src/lib/libbsp/powerpc/qoriq/Makefile.am
===================================================================
--- c/src/lib/libbsp/powerpc/qoriq/Makefile.am	(revision b80be1355033e59de3cc3eab418a4b6dc66d4a83)
+++ c/src/lib/libbsp/powerpc/qoriq/Makefile.am	(revision 3460c5228637b784edf68011d0e15d3f65517d61)
@@ -41,5 +41,5 @@
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/tictac.c
-librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bsp-start-zero.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bspidle.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/start/epapr_hcalls.S
Index: c/src/lib/libbsp/powerpc/shared/src/bsp-start-zero.S
===================================================================
--- c/src/lib/libbsp/powerpc/shared/src/bsp-start-zero.S	(revision b80be1355033e59de3cc3eab418a4b6dc66d4a83)
+++ 	(revision )
@@ -1,115 +1,0 @@
-/**
- * @file
- *
- * @ingroup bsp_start
- *
- * @brief bsp_start_zero() implementation.
- */
-
-/*
- * Copyright (c) 2010-2014 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems@embedded-brains.de>
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rtems.org/license/LICENSE.
- */
-
-#include <rtems/asm.h>
-#include <rtems/powerpc/powerpc.h>
-#include <bspopts.h>
-
-	.globl bsp_start_zero
-	.globl bsp_start_zero_begin
-	.globl bsp_start_zero_end
-	.globl bsp_start_zero_size
-
-	.section ".bsp_start_text", "ax"
-	.type bsp_start_zero, @function
-bsp_start_zero:
-bsp_start_zero_begin:
-	li	r0, 0
-	subi	r11, r3, 1
-	clrrwi	r11, r11, PPC_CACHE_ALIGN_POWER
-	addi	r10, r11, PPC_CACHE_ALIGNMENT
-	subf	r11, r3, r10
-	cmplw	cr7, r11, r4
-	add	r9, r3, r4
-	ble-	cr7, head_end_done
-	mr	r10, r9
-head_end_done:
-	subf	r11, r3, r10
-	addi	r11, r11, 1
-	mtctr	r11
-
-	/* Head loop */
-	b	head_loop_update
-head_loop_begin:
-	stb	r0, 0(r3)
-	addi	r3, r3, 1
-head_loop_update:
-	bdnz+	head_loop_begin
-
-	subf	r11, r3, r9
-	srwi	r11, r11, PPC_CACHE_ALIGN_POWER
-	addi	r11, r11, 1
-	mtctr	r11
-
-	/* Main loop */
-	b	main_loop_update
-main_loop_begin:
-#if BSP_DATA_CACHE_ENABLED
-	dcbz	r0, r3
-	dcbf	r0, r3
-#else
-  #if PPC_CACHE_ALIGNMENT == 32 || PPC_CACHE_ALIGNMENT == 64
-	stw	r0, 0(r3)
-	stw	r0, 4(r3)
-	stw	r0, 8(r3)
-	stw	r0, 12(r3)
-	stw	r0, 16(r3)
-	stw	r0, 20(r3)
-	stw	r0, 24(r3)
-	stw	r0, 28(r3)
-    #if PPC_CACHE_ALIGNMENT == 64
-	stw	r0, 32(r3)
-	stw	r0, 36(r3)
-	stw	r0, 40(r3)
-	stw	r0, 44(r3)
-	stw	r0, 48(r3)
-	stw	r0, 52(r3)
-	stw	r0, 56(r3)
-	stw	r0, 60(r3)
-    #endif
-  #else
-    #error "unsupported cache alignment"
-  #endif
-#endif
-	addi	r3, r3, PPC_CACHE_ALIGNMENT
-main_loop_update:
-	bdnz+	main_loop_begin
-
-	subf	r9, r3, r9
-	addi	r9, r9, 1
-	mtctr	r9
-
-	/* Tail loop */
-	b	tail_loop_update
-tail_loop_begin:
-	stb	r0, 0(r3)
-	addi	r3, r3, 1
-tail_loop_update:
-	bdnz+	tail_loop_begin
-
-	/* Return */
-	sync
-	isync
-	blr
-
-bsp_start_zero_end:
-	.set bsp_start_zero_size, bsp_start_zero_end - bsp_start_zero_begin
Index: c/src/lib/libbsp/powerpc/t32mppc/Makefile.am
===================================================================
--- c/src/lib/libbsp/powerpc/t32mppc/Makefile.am	(revision b80be1355033e59de3cc3eab418a4b6dc66d4a83)
+++ c/src/lib/libbsp/powerpc/t32mppc/Makefile.am	(revision 3460c5228637b784edf68011d0e15d3f65517d61)
@@ -33,5 +33,5 @@
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/tictac.c
-librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bsp-start-zero.S
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/t32mppc/start/bspstart.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/t32mppc/start/bspreset.c
Index: c/src/lib/libbsp/powerpc/virtex/Makefile.am
===================================================================
--- c/src/lib/libbsp/powerpc/virtex/Makefile.am	(revision b80be1355033e59de3cc3eab418a4b6dc66d4a83)
+++ c/src/lib/libbsp/powerpc/virtex/Makefile.am	(revision 3460c5228637b784edf68011d0e15d3f65517d61)
@@ -36,5 +36,5 @@
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/getentropy/getentropy-cpucounter.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
-librtemsbsp_a_SOURCES += ../shared/src/bsp-start-zero.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/start/bsp-start-zero.S
 
 # bspconsole
