more random patches. who knows.

[patches.git] / u-boot-jump-cmd.patch

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index d83f5af..0c34572 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -34,8 +34,14 @@ unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
 {
 	return entry (argc, argv);
 }
+__attribute__((weak))
+unsigned long do_jump_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
+{
+	return entry (argc, argv);
+}
 
-int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_it (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
+	unsigned long (*exec_hook)(ulong (*entry)(int, char *[]), int argc, char *argv[]))
 {
 	ulong	addr, rc;
 	int     rcode = 0;
@@ -53,13 +59,22 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 	 * pass address parameter as argv[0] (aka command name),
 	 * and all remaining args
 	 */
-	rc = do_go_exec ((void *)addr, argc - 1, argv + 1);
+	rc = exec_hook ((void *)addr, argc - 1, argv + 1);
 	if (rc != 0) rcode = 1;
 
 	printf ("## Application terminated, rc = 0x%lX\n", rc);
 	return rcode;
 }
 
+int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	return do_it (cmdtp, flag, argc, argv, do_go_exec);
+}
+int do_jump (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	return do_it (cmdtp, flag, argc, argv, do_jump_exec);
+}
+
 /* -------------------------------------------------------------------- */
 
 U_BOOT_CMD(
@@ -69,6 +84,13 @@ U_BOOT_CMD(
 	"      passing 'arg' as arguments\n"
 );
 
+U_BOOT_CMD(
+	jump, CFG_MAXARGS, 1,	do_jump,
+	"jump    - start executing code at address 'addr' and never return\n",
+	"addr [arg ...]\n    - jump to address 'addr'\n"
+	"      passing 'arg' as arguments\n"
+);
+
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 U_BOOT_CMD(