From: Jon Loeliger <jdl@freescale.com>
Date: Wed, 9 Aug 2006 19:41:17 +0000 (-0500)
Subject: Merge branch 'mpc85xx'
X-Git-Tag: U-Boot-1_1_6~20^2~1^2~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=92c427b18982167064de454ae5248ec466998919;p=oweals%2Fu-boot.git

Merge branch 'mpc85xx'

Conflicts:

	include/ft_build.h
	include/pci.h

Resolved, though.
---

92c427b18982167064de454ae5248ec466998919
diff --cc common/cmd_bootm.c
index e5d70fa202,f1c0eb4d18..0225cb7f27
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@@ -824,10 -836,10 +836,10 @@@ do_bootm_linux (cmd_tbl_t *cmdtp, int f
  	(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
  
  #else
- 	ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
+ 	ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
  	/* ft_dump_blob(of_flat_tree); */
  
 -#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
 +#if defined(CFG_INIT_RAM_LOCK) && (!defined(CONFIG_E500)||!defined(CONFIG_MPC86xx))
  	unlock_ram_in_cache();
  #endif
  	/*