diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-09-10 10:11:15 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-09-10 10:11:15 +0100 |
| commit | 7d54d64e9c9300cbd6cc3d1956e841b4c26a273a (patch) | |
| tree | 570446af965d3d8a7d2d34ff7973a6cbee6c21c6 /common/cmd_bootm.c | |
| parent | 470ffef72cf565c4db59352c23bd06cbfb763128 (diff) | |
| parent | 1d9e31e04911a6bb7cc66dd91132c699101c32e2 (diff) | |
| download | u-boot-imx-7d54d64e9c9300cbd6cc3d1956e841b4c26a273a.zip u-boot-imx-7d54d64e9c9300cbd6cc3d1956e841b4c26a273a.tar.gz u-boot-imx-7d54d64e9c9300cbd6cc3d1956e841b4c26a273a.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | 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) |