This splits the arch-specific logic out of do_go() and into a dedicated weak function called do_go_exec() that lives in cpu directories. This will need review from i386/nios people to make sure i didnt break them.
Signed-off-by: Mike Frysinger vapier@gentoo.org --- diff --git a/common/cmd_boot.c b/common/cmd_boot.c index e68f16f..82a5710 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -28,9 +28,11 @@ #include <command.h> #include <net.h>
-#if defined(CONFIG_I386) -DECLARE_GLOBAL_DATA_PTR; -#endif +__attribute__((weak)) +unsigned long do_go_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[]) { @@ -50,21 +52,7 @@ 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 */ -#if defined(CONFIG_I386) - /* - * x86 does not use a dedicated register to pass the pointer - * to the global_data - */ - argv[0] = (char *)gd; -#endif -#if !defined(CONFIG_NIOS) - rc = ((ulong (*)(int, char *[]))addr) (--argc, &argv[1]); -#else - /* - * Nios function pointers are address >> 1 - */ - rc = ((ulong (*)(int, char *[]))(addr>>1)) (--argc, &argv[1]); -#endif + rc = do_go_exec ((void *)addr, argv - 1, argv + 1); if (rc != 0) rcode = 1;
printf ("## Application terminated, rc = 0x%lX\n", rc); diff --git a/lib_i386/board.c b/lib_i386/board.c index 47fbab4..22191e6 100644 --- a/lib_i386/board.c +++ b/lib_i386/board.c @@ -421,3 +421,11 @@ void hang (void) puts ("### ERROR ### Please RESET the board ###\n"); for (;;); } + +unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[]) +{ + /* + * Nios function pointers are address >> 1 + */ + return (entry >> 1) (argc, argv); +} diff --git a/lib_nios/board.c b/lib_nios/board.c index 0a0d2e3..cdaf753 100644 --- a/lib_nios/board.c +++ b/lib_nios/board.c @@ -190,3 +190,13 @@ void hang (void) puts("### ERROR ### Please reset board ###\n"); for (;;); } + +unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[]) +{ + /* + * x86 does not use a dedicated register to pass the pointer + * to the global_data + */ + argv[-1] = (char *)gd; + return entry (argc, argv); +}