brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-10 21:26:19 +09:00
Code Issues Projects Releases Wiki Activity

* Fix disable_of booting

Browse Source 
Signed-off-by: Matthew McClintock <msm@freescale.com>
This commit is contained in:
Matthew McClintock 2006-08-16 13:59:47 -05:00
parent 25c751e9ad
commit 86c8e17f25
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/cmd_bootm.c
View File

@ -737,7 +737,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
} }
#ifdef CONFIG_OF_FLAT_TREE #ifdef CONFIG_OF_FLAT_TREE
if(argc >= 3) { if(argc > 3) {
of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16); of_flat_tree = (char *) simple_strtoul(argv[3], NULL, 16);
hdr = (image_header_t *)of_flat_tree; 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", printf (" Booting using flat device tree at 0x%x\n",
of_flat_tree); of_flat_tree);
} else if(getenv("disable_of") == NULL) {
printf ("ERROR: bootm needs flat device tree as third argument\n");
return;
} }
#endif #endif
if (!data) { if (!data) {