diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S
index 636ef5da63..15b804d9fc 100644
--- a/cpu/mpc85xx/start.S
+++ b/cpu/mpc85xx/start.S
@@ -992,7 +992,6 @@ trap_reloc:
 
 	blr
 
-#ifdef CFG_INIT_RAM_LOCK
 .globl unlock_ram_in_cache
 unlock_ram_in_cache:
 	/* invalidate the INIT_RAM section */
@@ -1002,11 +1001,10 @@ unlock_ram_in_cache:
 	andi.	r4,r4,0x1ff
 	slwi	r4,r4,(10 - 1 - L1_CACHE_SHIFT)
 	mtctr	r4
-1:	icbi	r0,r3
-	dcbi	r0,r3
+1:	dcbi	r0,r3
 	addi	r3,r3,CFG_CACHELINE_SIZE
 	bdnz	1b
-	sync			/* Wait for all icbi to complete on bus */
+	sync
 
 	/* Invalidate the TLB entries for the cache */
 	lis	r3,CFG_INIT_RAM_ADDR@h
@@ -1020,4 +1018,3 @@ unlock_ram_in_cache:
 	tlbivax	0,r3
 	isync
 	blr
-#endif