mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
Fix disable_of booting
Signed-off-by: Matthew McClintock <msm@freescale.com>
This commit is contained in:
parent
87a449c8ac
commit
5de62c47a8
1 changed files with 4 additions and 1 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue