From: Matthew McClintock <msm@freescale.com>
Date: Wed, 16 Aug 2006 18:59:47 +0000 (-0500)
Subject: * Fix disable_of booting
X-Git-Tag: U-Boot-1_1_6~25^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=86c8e17f25e972a7e272950a0735fad84e082b88;p=u-boot

* Fix disable_of booting

Signed-off-by: Matthew McClintock <msm@freescale.com>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6eb258ec2b..27bb494ff0 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) {