Code cleanup.

CHANGELOG

@@ -1,3 +1,36 @@
+commit 5e3b0bc19f07ed277d85324ad0427642c8981baf
+Author: Haavard Skinnemoen <hskinnemoen@atmel.com>
+Date:	Wed Oct 25 15:48:59 2006 +0200
+
+    Finish up support for the ATSTK1000/ATSTK1002 boards
+    
+    Add atstk1002_config target to Makefile and move the AVR32 section
+    down below Blackfin so that it doesn't end up in the middle of
+    MIPS.
+    
+    Drop the autogenerated linker script thing for now. Will have to
+    revisit how to handle chips with different flash and RAM layout
+    later.
+    
+    Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
+
+commit c76f951a747cfb87ba826ef45b5aea82d5b5dbb4
+Author: Kumar Gala <galak@kernel.crashing.org>
+Date:	Tue Oct 24 23:47:37 2006 -0500
+
+    Added support for Multi-Image files that contain a device tree
+    
+    If a Multi-Image file contains a third image we try to use it as a
+    device tree.  The device tree image is assumed to be uncompressed in the
+    image file.	 We automatically allocate space for the device tree in memory
+    and provide an 8k pad to allow more than a reasonable amount of growth.
+    
+    Additionally, a device tree that was contained in flash will now automatically
+    get copied to system memory as part of boot.  Previously an error was
+    reported if one tried to boot a device tree that was in flash.
+    
+    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
 commit 7c52c4b943ff52bbe8796a7e2d3e476ceaf3f512
 Author: Wolfgang Denk <wd@denx.de>
 Date:	Tue Oct 24 21:35:55 2006 +0200
@@ -200,6 +233,13 @@ Date:   Thu Oct 19 11:33:52 2006 -0500
     
     Signed-off-by: Matthew McClintock <msm@freescale.com>
 
+commit af9e1f5b9e6f9ce810f5e8bf2961c9542a5865c2
+Author: Stefan Roese <sr@denx.de>
+Date:	Tue Oct 17 06:14:31 2006 +0200
+
+    Add monitor functions for indirect access to PPC440 DCR's
+    Patch by Leonid Baryudin, 12 Oct 2006
+
 commit 5f3249a0a168e446a4cc9669b2bce0bc456f0a09
 Author: Jon Loeliger <jdl@freescale.com>
 Date:	Fri Oct 13 16:47:53 2006 -0500

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 */