summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-02-27 21:51:46 -0600
committerMarian Balakowicz <m8@semihalf.com>2008-02-29 12:32:50 +0100
commit274cea2bddbca10cdad7daa518951b75c44ef6bc (patch)
tree8978d23a1fbcbcc5811db1b1b2fc1351fa542665 /include
parentd2bc095a639672def11d5d043b5688d0dbd692ec (diff)
downloadu-boot-imx-274cea2bddbca10cdad7daa518951b75c44ef6bc.zip
u-boot-imx-274cea2bddbca10cdad7daa518951b75c44ef6bc.tar.gz
u-boot-imx-274cea2bddbca10cdad7daa518951b75c44ef6bc.tar.bz2
[new uImage] rework error handling so common functions don't reset
Changed image_get_ramdisk() to just return NULL on error and have get_ramdisk() propogate that error to the caller. It's left to the caller to call do_reset() if it wants to. Also moved calling do_reset() in get_fdt() and fdt_relocate() on ppc to a common location. In the future we will change get_fdt() and fdt_relocate() to return success/failure and not call do_reset() at all. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Marian Balakowicz <m8@semihalf.com>
Diffstat (limited to 'include')
-rw-r--r--include/image.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/image.h b/include/image.h
index 1cec1db..025ec0f 100644
--- a/include/image.h
+++ b/include/image.h
@@ -382,7 +382,7 @@ void image_print_contents (image_header_t *hdr);
int gen_image_get_format (void *img_addr);
ulong gen_get_image (ulong img_addr);
-void get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
+int get_ramdisk (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
bootm_headers_t *images, uint8_t arch,
ulong *rd_start, ulong *rd_end);