* 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 6eb258e..27bb494 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -737,7 +737,7 @@
}
#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 @@
}
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) {