summaryrefslogtreecommitdiffstats
path: root/commands/go.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-03-06 09:39:59 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-03-06 09:39:59 +0100
commitbeb36c510bd6abf80a20148bf165a990c69fed8a (patch)
tree95e7a242ee9c264bc35f2aedddacae74e93d7ad9 /commands/go.c
parente0d674735b26c279d4cb6c73c140f1e0866a7953 (diff)
parent276252a5598a9596970cc02f186c3847b932dcc1 (diff)
downloadbarebox-beb36c510bd6abf80a20148bf165a990c69fed8a.tar.gz
barebox-beb36c510bd6abf80a20148bf165a990c69fed8a.tar.xz
Merge branch 'work/thumb2' into next
Diffstat (limited to 'commands/go.c')
-rw-r--r--commands/go.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/commands/go.c b/commands/go.c
index b97fcef32a..c821207a6f 100644
--- a/commands/go.c
+++ b/commands/go.c
@@ -62,7 +62,11 @@ static int do_go(int argc, char *argv[])
func = addr;
shutdown_barebox();
- func(argc - 1, &argv[1]);
+
+ if (do_execute)
+ do_execute(func, argc - 1, &argv[1]);
+ else
+ func(argc - 1, &argv[1]);
/*
* The application returned. Since we have shutdown barebox and