Index: boot/arch/arm32/src/asm.S
===================================================================
--- boot/arch/arm32/src/asm.S	(revision 15fbe6acd40fcb3e688db865b931ed04c43f0548)
+++ boot/arch/arm32/src/asm.S	(revision 803f581583fee8bca1931696b1aa2a9586bf85c5)
@@ -75,18 +75,18 @@
 	bic	r4, r4, #(1 << CP15_C1_DC)
 
-	# Disable I-cache and Branche predictors.
+	# Disable I-cache and Branch predictors.
 	bic	r4, r4, #(1 << CP15_C1_IC)
+#ifdef PROCESSOR_ARCH_armv6
 	bic	r4, r4, #(1 << CP15_C1_BP)
+#endif
 	
 	mcr	p15, 0, r4, c1, c0, 0
 #endif
-
-
 	
-	#Wait for the operations to complete
+	# Wait for the operations to complete
 #ifdef PROCESSOR_ARCH_armv7_a
 	dsb
 #else
-	#cp15 dsb, r4 is ignored (should be zero)
+	# cp15 dsb, r4 is ignored (should be zero)
 	mov r4, #0
 	mcr p15, 0, r4, c7, c10, 4
@@ -98,9 +98,9 @@
 	nop
 
-	#Wait for the operations to complete
+	# Wait for the operations to complete
 #ifdef PROCESSOR_ARCH_armv7_a
 	isb
 	nop
-#else
+#elif PROCESSOR_ARCH_armv6
 	# cp15 isb
 	mcr p15, 0, r4, c7, c5, 4