Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix disable_of booting

Browse Source 
Signed-off-by: Matthew McClintock <msm@freescale.com>
master
Matthew McClintock 19 years ago committed by Jon Loeliger
parent 87a449c8ac
commit 5de62c47a8
1 changed files with 4 additions and 1 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      common/cmd_bootm.c

5
common/cmd_bootm.c
Unescape 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) {

Write Preview
Loading…
Cancel
Save