diff options
| author | Michal Simek <monstr@monstr.eu> | 2008-07-11 10:43:13 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-13 15:23:12 +0200 | 
| commit | c78fce699c7ff467ecd841da6a79f065180bf578 (patch) | |
| tree | fc21712abce7ab7482b2394a50e6e7755a222b48 /common/image.c | |
| parent | 84a2c64a26dc5e275e1cf4e76a6e194a18fb5477 (diff) | |
| download | olio-uboot-2014.01-c78fce699c7ff467ecd841da6a79f065180bf578.tar.xz olio-uboot-2014.01-c78fce699c7ff467ecd841da6a79f065180bf578.zip | |
FIS: repare incorrect return value with ramdisk handling
Microblaze and PowerPC use boot_get_ramdisk for loading
ramdisk to memory with checking return value.
Return 0 means success. Return 1 means failed.
Here is correspond part of code from bootm.c which check
return code.
ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC,
		&rd_data_start, &rd_data_end);
if (ret)
	goto error;
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/common/image.c b/common/image.c index ddd9e8ba0..535c302d4 100644 --- a/common/image.c +++ b/common/image.c @@ -827,13 +827,13 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,  			cfg_noffset = fit_conf_get_node (fit_hdr, fit_uname_config);  			if (cfg_noffset < 0) {  				debug ("*  ramdisk: no such config\n"); -				return 0; +				return 1;  			}  			rd_noffset = fit_conf_get_ramdisk_node (fit_hdr, cfg_noffset);  			if (rd_noffset < 0) {  				debug ("*  ramdisk: no ramdisk in config\n"); -				return 0; +				return 1;  			}  		}  #endif @@ -872,7 +872,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,  			if (!fit_check_format (fit_hdr)) {  				puts ("Bad FIT ramdisk image format!\n");  				show_boot_progress (-120); -				return 0; +				return 1;  			}  			show_boot_progress (121); @@ -887,7 +887,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,  				if (cfg_noffset < 0) {  					puts ("Could not find configuration node\n");  					show_boot_progress (-122); -					return 0; +					return 1;  				}  				fit_uname_config = fdt_get_name (fit_hdr, cfg_noffset, NULL);  				printf ("   Using '%s' configuration\n", fit_uname_config); @@ -902,20 +902,20 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,  			if (rd_noffset < 0) {  				puts ("Could not find subimage node\n");  				show_boot_progress (-124); -				return 0; +				return 1;  			}  			printf ("   Trying '%s' ramdisk subimage\n", fit_uname_ramdisk);  			show_boot_progress (125);  			if (!fit_check_ramdisk (fit_hdr, rd_noffset, arch, images->verify)) -				return 0; +				return 1;  			/* get ramdisk image data address and length */  			if (fit_image_get_data (fit_hdr, rd_noffset, &data, &size)) {  				puts ("Could not find ramdisk subimage data!\n");  				show_boot_progress (-127); -				return 0; +				return 1;  			}  			show_boot_progress (128); @@ -925,7 +925,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,  			if (fit_image_get_load (fit_hdr, rd_noffset, &rd_load)) {  				puts ("Can't get ramdisk subimage load address!\n");  				show_boot_progress (-129); -				return 0; +				return 1;  			}  			show_boot_progress (129); |