diff options
| author | Matthew McClintock <msm@freescale.com> | 2006-08-22 09:31:59 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-08-22 09:31:59 -0500 |
| commit | 5de62c47a8628b3da4d73f7c07027f32a3342d40 (patch) | |
| tree | 6a69f99068bb97ebeb8e774c8ea1ec3547bc8e29 | |
| parent | 87a449c8ac396420cb24260f717ea9e6faa82047 (diff) | |
| download | u-boot-5de62c47a8628b3da4d73f7c07027f32a3342d40.tar.gz u-boot-5de62c47a8628b3da4d73f7c07027f32a3342d40.tar.xz u-boot-5de62c47a8628b3da4d73f7c07027f32a3342d40.zip | |
Fix disable_of booting
Signed-off-by: Matthew McClintock <msm@freescale.com>
| -rw-r--r-- | common/cmd_bootm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index f980659f7b..652d8431da 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -737,7 +737,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, } #ifdef CONFIG_OF_FLAT_TREE - if(argc >= 3) { + if(argc > 3) { of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16); hdr = (image_header_t *)of_flat_tree; @@ -802,6 +802,9 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, } printf (" Booting using flat device tree at 0x%x\n", of_flat_tree); + } else if(getenv("disable_of") == NULL) { + printf ("ERROR: bootm needs flat device tree as third argument\n"); + return; } #endif if (!data) { |