Signed-off-by: Grant Likely grant.likely@secretlab.ca

---

Wolfgang, this is a bugfix that needs to go in for 1.3.0. I'll also push it to the mpc5xxx tree.

Cheers, g.

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

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9f5e0b4..6ebedfb 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -834,9 +834,11 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, of_flat_tree += 4 - tail; }

+#ifndef CFG_NO_FLASH /* move the blob if it is in flash (set of_data to !null) */ if (addr2info ((ulong)of_flat_tree) != NULL) of_data = (ulong)of_flat_tree; +#endif

#if defined(CONFIG_OF_FLAT_TREE)