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>
This commit is contained in:
parent
78f9fef7f4
commit
10aaf716cb
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user