summaryrefslogtreecommitdiff
path: root/board/gdsys/p1022/controlcenterd.c
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-25 08:39:58 (GMT)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-06-25 08:39:58 (GMT)
commited1d98d801dfb6384d0f2fff45ce1ebf884944ca (patch)
tree5a9487c67b75606d3a723b7acb9eda8da200c871 /board/gdsys/p1022/controlcenterd.c
parent754466ac95e92ebf40e25c6af6f13ab9b4d7c87b (diff)
parentba9b42c81b0734d53edfbb1fe4a6ded7de78c5ab (diff)
downloadu-boot-fsl-qoriq-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.tar.xz
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/gdsys/p1022/controlcenterd.c')
-rw-r--r--board/gdsys/p1022/controlcenterd.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 8ccd9ce..642b807 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/board/gdsys/p1022/controlcenterd.c
@@ -221,11 +221,7 @@ void hw_watchdog_reset(void)
#ifdef CONFIG_TRAILBLAZER
int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- int rcode = 0;
-
- if (run_command(getenv("bootcmd"), flag) < 0)
- rcode = 1;
- return rcode;
+ return run_command(getenv("bootcmd"), flag);
}
int board_early_init_r(void)