summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2007-08-15 17:30:56 -0500
committerWolfgang Denk <wd@denx.de>2007-08-16 12:10:56 +0200
commit10aaf716cb0dc6614df54ef78bed5144afd23ef8 (patch)
tree1e8646f9ab5292f547a76a062ee65dfaa3d66854 /common
parent78f9fef7f406078c8bf7191e665a73f795157746 (diff)
downloadu-boot-imx-10aaf716cb0dc6614df54ef78bed5144afd23ef8.zip
u-boot-imx-10aaf716cb0dc6614df54ef78bed5144afd23ef8.tar.gz
u-boot-imx-10aaf716cb0dc6614df54ef78bed5144afd23ef8.tar.bz2
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>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index df1d038..90e3f8b 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;