From 10aaf716cb0dc6614df54ef78bed5144afd23ef8 Mon Sep 17 00:00:00 2001
From: Andy Fleming <afleming@freescale.com>
Date: Wed, 15 Aug 2007 17:30:56 -0500
Subject: [PATCH] Fix of_data copying for CONFIG_OF_FLAT_TREE-using boards
The fix, "Fix where the #ifdef CFG_BOOTMAPSZ is placed"
neglected to *also* put the code inside the similar #ifdef
for CONFIG_OF_FLAT_TREE.
Signed-off-by: Andy Fleming <afleming@freescale.com>
---
common/cmd_bootm.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index df1d0380d4..90e3f8b9af 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -987,6 +987,15 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
#endif
#endif /* CONFIG_OF_LIBFDT */
#if defined(CONFIG_OF_FLAT_TREE)
+#ifdef CFG_BOOTMAPSZ
+ /*
+ * The blob must be within CFG_BOOTMAPSZ,
+ * so we flag it to be copied if it is not.
+ */
+ if (of_flat_tree >= (char *)CFG_BOOTMAPSZ)
+ of_data = of_flat_tree;
+#endif
+
/* move of_flat_tree if needed */
if (of_data) {
ulong of_start, of_len;
--
2.39.5