Code cleanup.

Makefile

@@ -330,7 +330,7 @@ endif
 
 .PHONY : CHANGELOG
 CHANGELOG:
-	git log --no-merges U-Boot-1_1_5.. > $@
+	git log --no-merges U-Boot-1_1_5.. | unexpand -a > $@
 
 #########################################################################
 

common/cmd_bootm.c

@@ -929,7 +929,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 	 */
 	(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
 
-#else
+#else	/* CONFIG_OF_FLAT_TREE */
 	/* move of_flat_tree if needed */
 	if (of_data) {
 		ulong of_start, of_len;
@@ -971,8 +971,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 		/* ft_dump_blob(of_flat_tree); */
 		(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
 	}
-		
-#endif
+#endif	/* CONFIG_OF_FLAT_TREE */
 }
 #endif /* CONFIG_PPC */
 

common/cmd_dcr.c

@@ -181,7 +181,7 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 	if (argc < 4) {
 		printf ("Usage:\n%s\n", cmdtp->usage);
 		return 1;
-        }
+	}
 
 	/* Find out whether ther is '.' (dot) symbol in the first parameter. */
 	strncpy (buf, argv[1], sizeof(buf)-1);
@@ -198,9 +198,9 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		 * First parameter has format adr_dcrn; dat_dcrn will be
 		 * calculated as adr_dcrn+1.
 		 */
-        	adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
-        	dat_dcrn = adr_dcrn+1;
-        }
+		adr_dcrn = (unsigned short) simple_strtoul (buf, NULL, 16);
+		dat_dcrn = adr_dcrn+1;
+	}
 
 	/* Register's offset */
 	offset = (unsigned short) simple_strtoul (argv[2], NULL, 16);