Subject: fix up the bd_info address

From: Vitaly Bordug <[email-masked]>
Date: Fri, 27 Oct 2006 00:17:02 +0400

Hi,

The patch is attached. It is applied after Matt's bootm stuff. I was going to send it through u-boot list when
all the things around FDT will arrive there. It used to fix the problem booting the bd_t kernel on FDT u-boot.

Just as reference for now.

Signed-off-by: Vitaly Bordug <[email-masked]>
Patch fixes the address of the board info passed to kernel when OF tree is disabled.

---

 common/cmd_bootm.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index f1c0eb4..eb59817 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -836,8 +836,12 @@ #endif
 	(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
 
 #else
-	ft_setup(of_flat_tree, kbd, initrd_start, initrd_end);
-	/* ft_dump_blob(of_flat_tree); */
+	if (getenv("disable_of") != NULL)
+		of_flat_tree = kbd;
+	else {
+		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)
 	unlock_ram_in_cache();