summaryrefslogtreecommitdiff
path: root/lib_microblaze/bootm.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-12 16:14:28 +0200
committerWolfgang Denk <wd@denx.de>2008-09-12 16:14:28 +0200
commit225f0eaa745adfae05931848543d99942798756a (patch)
treef5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /lib_microblaze/bootm.c
parent6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff)
parentafbc526336447a7357e9c82852df0377d09a8089 (diff)
downloadu-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip
u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz
u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'lib_microblaze/bootm.c')
-rw-r--r--lib_microblaze/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_microblaze/bootm.c b/lib_microblaze/bootm.c
index 5986a31..52fe068 100644
--- a/lib_microblaze/bootm.c
+++ b/lib_microblaze/bootm.c
@@ -49,6 +49,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
theKernel (commandline);
/* does not return */
-error:
+
return 1;
}