diff options
Diffstat (limited to 'lib_microblaze/bootm.c')
| -rw-r--r-- | lib_microblaze/bootm.c | 17 | 
1 files changed, 14 insertions, 3 deletions
| diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c index 99c453369..fab4a5441 100644 --- a/lib_microblaze/bootm.c +++ b/lib_microblaze/bootm.c @@ -47,12 +47,16 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],  		ep = image_get_ep (images->legacy_hdr_os);  #if defined(CONFIG_FIT)  	} else if (images->fit_uname_os) { -		fit_unsupported_reset ("MICROBLAZE linux bootm"); -		do_reset (cmdtp, flag, argc, argv); +		int ret = fit_image_get_entry (images->fit_hdr_os, +				images->fit_noffset_os, &ep); +		if (ret) { +			puts ("Can't get entry point property!\n"); +			goto error; +		}  #endif  	} else {  		puts ("Could not find kernel entry point!\n"); -		do_reset (cmdtp, flag, argc, argv); +		goto error;  	}  	theKernel = (void (*)(char *))ep; @@ -67,4 +71,11 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],  		return ;  	theKernel (commandline); +	/* does not return */ +	return; + +error: +	if (images->autostart) +		do_reset (cmdtp, flag, argc, argv); +	return;  } |