Index: boot/arch/arm32/include/arch/mm.h
===================================================================
--- boot/arch/arm32/include/arch/mm.h	(revision e897527842650001c9fb751fa6a1792a272858d7)
+++ boot/arch/arm32/include/arch/mm.h	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -71,6 +71,8 @@
 #define BCM2835_RAM_END     0x20000000
 
-/* Page table level 0 entry - "section" format is used
- * (one-level paging, 1 MB sized pages). Used only while booting the kernel.
+/** Page table level 0 entry
+ *
+ * "section" format is used (one-level paging, 1 MB sized pages).
+ * Used only while booting the kernel.
  */
 typedef struct {
Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision e897527842650001c9fb751fa6a1792a272858d7)
+++ boot/arch/arm32/src/mm.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -210,5 +210,6 @@
 	    "mrc p15, 0, r0, c1, c0, 0\n"
 
-	    /* Enable ICache, DCache, BPredictors and MMU,
+	    /*
+	     * Enable ICache, DCache, BPredictors and MMU,
 	     * we disable caches before jumping to kernel
 	     * so this is safe for all archs.
@@ -224,5 +225,6 @@
 	    "orr r0, r0, r1\n"
 
-	    /* Invalidate the TLB content before turning on the MMU.
+	    /*
+	     * Invalidate the TLB content before turning on the MMU.
 	     * ARMv7-A Reference manual, B3.10.3
 	     */
@@ -240,8 +242,10 @@
 	disable_paging();
 #ifdef PROCESSOR_ARCH_armv7_a
-	/* Make sure we run in memory code when caches are enabled,
+	/*
+	 * Make sure we run in memory code when caches are enabled,
 	 * make sure we read memory data too. This part is ARMv7 specific as
 	 * ARMv7 no longer invalidates caches on restart.
-	 * See chapter B2.2.2 of ARM Architecture Reference Manual p. B2-1263*/
+	 * See chapter B2.2.2 of ARM Architecture Reference Manual p. B2-1263
+	 */
 	cache_invalidate();
 #endif
Index: boot/genarch/src/multiplication.c
===================================================================
--- boot/genarch/src/multiplication.c	(revision e897527842650001c9fb751fa6a1792a272858d7)
+++ boot/genarch/src/multiplication.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -90,5 +90,6 @@
 	}
 
-	/* (if OF checked) a1 or b1 is zero => result fits in 64 bits,
+	/*
+	 * (if OF checked) a1 or b1 is zero => result fits in 64 bits,
 	 * no need to another overflow check
 	 */
@@ -104,5 +105,6 @@
 	t2 += t1;
 
-	/* t2 & (1ull << 63) - if this bit is set in unsigned long long,
+	/*
+	 * t2 & (1ull << 63) - if this bit is set in unsigned long long,
 	 * result does not fit in signed one
 	 */
Index: boot/generic/src/str.c
===================================================================
--- boot/generic/src/str.c	(revision e897527842650001c9fb751fa6a1792a272858d7)
+++ boot/generic/src/str.c	(revision 7c3fb9bd77e4d2f6c10517a052e567f176fa91ee)
@@ -215,6 +215,8 @@
 		return EINVAL;
 
-	/* Unsigned version of ch (bit operations should only be done
-	   on unsigned types). */
+	/*
+	 * Unsigned version of ch (bit operations should only be done
+	 * on unsigned types).
+	 */
 	uint32_t cc = (uint32_t) ch;