Index: boot/arch/arm32/src/mm.c
===================================================================
--- boot/arch/arm32/src/mm.c	(revision 1abcf1db7c2a8071caaf9983f1571b2ef88e1be6)
+++ boot/arch/arm32/src/mm.c	(revision d2f75eb31efa7109d60f52eb578fddc21c8d1e2d)
@@ -43,5 +43,6 @@
 {
 	unsigned log = 0;
-	while (val >> log++);
+	while (val >> log++)
+		;
 	return log - 2;
 }
@@ -70,6 +71,5 @@
 	const uint32_t cinfo = CLIDR_read();
 	for (unsigned i = 0; i < 7; ++i) {
-		switch (CLIDR_CACHE(i, cinfo))
-		{
+		switch (CLIDR_CACHE(i, cinfo)) {
 		case CLIDR_DCACHE_ONLY:
 		case CLIDR_SEP_CACHE:
@@ -78,7 +78,7 @@
 		}
 	}
-	asm volatile ( "dsb\n" );
+	asm volatile ("dsb\n");
 	ICIALLU_write(0);
-	asm volatile ( "isb\n" );
+	asm volatile ("isb\n");
 }
 #endif
@@ -88,8 +88,8 @@
 {
 	asm volatile (
-		"mrc p15, 0, r0, c1, c0, 0\n"
-		"bic r0, r0, #1\n"
-		"mcr p15, 0, r0, c1, c0, 0\n"
-		::: "r0"
+	    "mrc p15, 0, r0, c1, c0, 0\n"
+	    "bic r0, r0, #1\n"
+	    "mcr p15, 0, r0, c1, c0, 0\n"
+	    ::: "r0"
 	);
 }
@@ -135,5 +135,5 @@
  *
  */
-static void init_ptl0_section(pte_level0_section_t* pte,
+static void init_ptl0_section(pte_level0_section_t *pte,
     pfn_t frame)
 {
@@ -204,9 +204,9 @@
 	asm volatile (
 		/* Behave as a client of domains */
-		"ldr r0, =0x55555555\n"
-		"mcr p15, 0, r0, c3, c0, 0\n"
+	    "ldr r0, =0x55555555\n"
+	    "mcr p15, 0, r0, c3, c0, 0\n"
 
 		/* Current settings */
-		"mrc p15, 0, r0, c1, c0, 0\n"
+	    "mrc p15, 0, r0, c1, c0, 0\n"
 
 		/* Enable ICache, DCache, BPredictors and MMU,
@@ -217,19 +217,19 @@
 		 */
 #ifdef PROCESSOR_ARCH_armv6
-		"ldr r1, =0x00801805\n"
+	    "ldr r1, =0x00801805\n"
 #else
-		"ldr r1, =0x00001805\n"
-#endif
-
-		"orr r0, r0, r1\n"
+	    "ldr r1, =0x00001805\n"
+#endif
+
+	    "orr r0, r0, r1\n"
 
 		/* Invalidate the TLB content before turning on the MMU.
 		 * ARMv7-A Reference manual, B3.10.3
 		 */
-		"mcr p15, 0, r0, c8, c7, 0\n"
+	    "mcr p15, 0, r0, c8, c7, 0\n"
 
 		/* Store settings, enable the MMU */
-		"mcr p15, 0, r0, c1, c0, 0\n"
-		::: "r0", "r1"
+	    "mcr p15, 0, r0, c1, c0, 0\n"
+	    ::: "r0", "r1"
 	);
 }
Index: boot/arch/ppc32/src/main.c
===================================================================
--- boot/arch/ppc32/src/main.c	(revision 1abcf1db7c2a8071caaf9983f1571b2ef88e1be6)
+++ boot/arch/ppc32/src/main.c	(revision d2f75eb31efa7109d60f52eb578fddc21c8d1e2d)
@@ -122,6 +122,6 @@
 
 	uintptr_t balloc_start = ALIGN_UP(top, PAGE_SIZE);
-	size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE))
-	    >> PAGE_WIDTH;
+	size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE)) >>
+	    PAGE_WIDTH;
 	void *transtable;
 	void *transtable_pa;
Index: boot/arch/sparc64/src/ofw.c
===================================================================
--- boot/arch/sparc64/src/ofw.c	(revision 1abcf1db7c2a8071caaf9983f1571b2ef88e1be6)
+++ boot/arch/sparc64/src/ofw.c	(revision d2f75eb31efa7109d60f52eb578fddc21c8d1e2d)
@@ -88,7 +88,7 @@
 				 * "cpuid" for US-IV
 				 */
-				if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0)
-				    && (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0)
-				    && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
+				if ((ofw_get_property(child, "upa-portid", &mid, sizeof(mid)) <= 0) &&
+				    (ofw_get_property(child, "portid", &mid, sizeof(mid)) <= 0) &&
+				    (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0))
 					continue;
 
@@ -117,8 +117,8 @@
 
 	asm volatile (
-		"ldxa [%[zero]] %[asi], %[current_mid]\n"
-		: [current_mid] "=r" (current_mid)
-		: [zero] "r" (0),
-		  [asi] "i" (ASI_ICBUS_CONFIG)
+	    "ldxa [%[zero]] %[asi], %[current_mid]\n"
+	    : [current_mid] "=r" (current_mid)
+	    : [zero] "r" (0),
+	      [asi] "i" (ASI_ICBUS_CONFIG)
 	);
 
Index: boot/genarch/src/division.c
===================================================================
--- boot/genarch/src/division.c	(revision 1abcf1db7c2a8071caaf9983f1571b2ef88e1be6)
+++ boot/genarch/src/division.c	(revision d2f75eb31efa7109d60f52eb578fddc21c8d1e2d)
@@ -56,5 +56,5 @@
 	for (; steps > 0; steps--) {
 		/* shift one bit to remainder */
-		*remainder = ((*remainder) << 1) | (( a >> 31) & 0x1);
+		*remainder = ((*remainder) << 1) | ((a >> 31) & 0x1);
 		result <<= 1;
 
Index: boot/generic/src/inflate.c
===================================================================
--- boot/generic/src/inflate.c	(revision 1abcf1db7c2a8071caaf9983f1571b2ef88e1be6)
+++ boot/generic/src/inflate.c	(revision d2f75eb31efa7109d60f52eb578fddc21c8d1e2d)
@@ -418,6 +418,6 @@
  *
  */
-static int inflate_codes(inflate_state_t *state, huffman_t* len_code,
-    huffman_t* dist_code)
+static int inflate_codes(inflate_state_t *state, huffman_t *len_code,
+    huffman_t *dist_code)
 {
 	uint16_t symbol;
@@ -460,6 +460,6 @@
 			while (len > 0) {
 				/* Copy len bytes from distance bytes back */
-				state->dest[state->destcnt]
-				    = state->dest[state->destcnt - dist];
+				state->dest[state->destcnt] =
+				    state->dest[state->destcnt - dist];
 				state->destcnt++;
 				len--;
@@ -527,6 +527,6 @@
 	CHECK_OVERRUN(*state);
 
-	if ((nlen > MAX_LITLEN) || (ndist > MAX_DIST)
-	    || (ncode > MAX_ORDER))
+	if ((nlen > MAX_LITLEN) || (ndist > MAX_DIST) ||
+	    (ncode > MAX_ORDER))
 		return EINVAL;