summaryrefslogtreecommitdiff
path: root/lib_sparc/bootm.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib_sparc/bootm.c')
-rw-r--r--lib_sparc/bootm.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib_sparc/bootm.c b/lib_sparc/bootm.c
index f3abdcfdc4..4e8c92048e 100644
--- a/lib_sparc/bootm.c
+++ b/lib_sparc/bootm.c
@@ -33,7 +33,6 @@
extern image_header_t header;
extern void srmmu_init_cpu(unsigned int entry);
extern void prepare_bootargs(char *bootargs);
-extern int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]);
#ifdef CONFIG_USB_UHCI
extern int usb_lowlevel_stop(void);
@@ -83,8 +82,7 @@ struct __attribute__ ((packed)) {
image_header_t ihdr;
/* boot the linux kernel */
-void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
- bootm_headers_t * images)
+int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t * images)
{
char *bootargs;
ulong initrd_start, initrd_end;
@@ -181,6 +179,5 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],
while (1) ;
error:
- do_reset(cmdtp, flag, argc, argv);
- return;
+ return 1;
}