diff options
| author | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-08-12 20:39:27 +0200 | 
| commit | 9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch) | |
| tree | 40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /common/image.c | |
| parent | 1c7015100a620582224f25eb057573a0fe147648 (diff) | |
| parent | cd82919e6c8a73b363a26f34b734923844e52d1c (diff) | |
| download | olio-uboot-2014.01-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.xz olio-uboot-2014.01-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 3 | 
1 files changed, 1 insertions, 2 deletions
| diff --git a/common/image.c b/common/image.c index 535c302d4..6d2ce32e7 100644 --- a/common/image.c +++ b/common/image.c @@ -189,7 +189,6 @@ int image_check_dcrc (image_header_t *hdr)  	return (dcrc == image_get_dcrc (hdr));  } -  /**   * image_multi_count - get component (sub-image) count   * @hdr: pointer to the header of the multi component image @@ -833,7 +832,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,  			rd_noffset = fit_conf_get_ramdisk_node (fit_hdr, cfg_noffset);  			if (rd_noffset < 0) {  				debug ("*  ramdisk: no ramdisk in config\n"); -				return 1; +				return 0;  			}  		}  #endif |