[U-Boot-Users] [PATCH 1/1] FIS: repare incorrect return value with ramdisk handling
monstr at seznam.cz
monstr at seznam.cz
Fri Jul 11 11:50:52 CEST 2008
From: Michal Simek <monstr at monstr.eu>
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 at monstr.eu>
---
common/image.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/image.c b/common/image.c
index 4a024d4..4a4472f 100644
--- a/common/image.c
+++ b/common/image.c
@@ -826,13 +826,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
@@ -871,7 +871,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);
@@ -886,7 +886,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);
@@ -901,20 +901,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);
@@ -924,7 +924,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);
--
1.5.4.GIT
More information about the U-Boot
mailing list