diff options
| author | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-09-08 10:35:49 +0200 |
| commit | c351575c226eaad85f12b0d346e762260b263531 (patch) | |
| tree | c2c1748a95c589278cbf048c191728fd5a9ea753 /common/image.c | |
| parent | ac53ee8318678190bf3c68da477a84a657d86fb0 (diff) | |
| parent | 302e52e0b1d4c7f994991709d0cb6c3ea612cdb5 (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'common/image.c')
| -rw-r--r-- | common/image.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/image.c b/common/image.c index 55c4ccec8b..94f01ad455 100644 --- a/common/image.c +++ b/common/image.c @@ -749,7 +749,7 @@ int genimg_has_config (bootm_headers_t *images) * rd_start and rd_end are set to ramdisk start/end addresses if * ramdisk image is found and valid * - * 1, if ramdisk image is found but corrupted + * 1, if ramdisk image is found but corrupted, or invalid * rd_start and rd_end are set to 0 if no ramdisk exists */ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images, @@ -936,6 +936,7 @@ int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images, default: puts ("Wrong Ramdisk Image Format\n"); rd_data = rd_len = rd_load = 0; + return 1; } #if defined(CONFIG_B2) || defined(CONFIG_EVB4510) || defined(CONFIG_ARMADILLO) @@ -1516,7 +1517,7 @@ int boot_get_fdt (int flag, int argc, char *argv[], bootm_headers_t *images, } break; default: - fdt_error ("Did not find a cmdline Flattened Device Tree"); + puts ("ERROR: Did not find a cmdline Flattened Device Tree\n"); goto error; } |