summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-09-07 09:25:07 -0600
committerWolfgang Denk <wd@denx.de>2007-09-09 00:41:52 +0200
commita7d7eca791a37f452c9da10fef4b31dd7aa9a622 (patch)
tree98dbeae0f7baa170adb4318ce441a3bbc5dee3a7
parent87eb200ea87571f00473dc5a73fadbb5aa6dd309 (diff)
downloadu-boot-imx-a7d7eca791a37f452c9da10fef4b31dd7aa9a622.zip
u-boot-imx-a7d7eca791a37f452c9da10fef4b31dd7aa9a622.tar.gz
u-boot-imx-a7d7eca791a37f452c9da10fef4b31dd7aa9a622.tar.bz2
Bugfix: make bootm+libfdt compile on boards with no flash
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--common/cmd_bootm.c2
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)