summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-01-07 02:53:40 +0000
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2013-01-16 10:52:07 +0100
commite08634c7bfdb5fcda2541a8845d44888538d6178 (patch)
tree0c3fb82e0173542013cf12ba8c1a676397d5b12a /arch
parent75a279c8f28539f560a23425073d97ffee746716 (diff)
downloadu-boot-imx-e08634c7bfdb5fcda2541a8845d44888538d6178.zip
u-boot-imx-e08634c7bfdb5fcda2541a8845d44888538d6178.tar.gz
u-boot-imx-e08634c7bfdb5fcda2541a8845d44888538d6178.tar.bz2
MIPS: bootm.c: separate linux jump code
Move the actual jump code into a separate function. This make the code reusable for bootm subcommands. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/lib/bootm.c32
1 files changed, 19 insertions, 13 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index 4ac712a..689d17b 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -43,10 +43,27 @@ static int linux_env_idx;
static void linux_params_init(ulong start, char *commandline);
static void linux_env_set(char *env_name, char *env_val);
+static void boot_jump_linux(bootm_headers_t *images)
+{
+ void (*theKernel) (int, char **, char **, int *);
+
+ /* find kernel entry point */
+ theKernel = (void (*)(int, char **, char **, int *))images->ep;
+
+ debug("## Transferring control to Linux (at address %08lx) ...\n",
+ (ulong) theKernel);
+
+ bootstage_mark(BOOTSTAGE_ID_RUN_OS);
+
+ /* we assume that the kernel is in place */
+ printf("\nStarting kernel ...\n\n");
+
+ theKernel(linux_argc, linux_argv, linux_env, 0);
+}
+
int do_bootm_linux(int flag, int argc, char * const argv[],
bootm_headers_t *images)
{
- void (*theKernel) (int, char **, char **, int *);
char *commandline = getenv("bootargs");
char env_buf[12];
char *cp;
@@ -54,14 +71,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1;
- /* find kernel entry point */
- theKernel = (void (*)(int, char **, char **, int *))images->ep;
-
- bootstage_mark(BOOTSTAGE_ID_RUN_OS);
-
- debug("## Transferring control to Linux (at address %08lx) ...\n",
- (ulong) theKernel);
-
linux_params_init(UNCACHED_SDRAM(gd->bd->bi_boot_params), commandline);
#ifdef CONFIG_MEMSIZE_IN_BYTES
@@ -95,10 +104,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
if (cp)
linux_env_set("eth1addr", cp);
- /* we assume that the kernel is in place */
- printf("\nStarting kernel ...\n\n");
-
- theKernel(linux_argc, linux_argv, linux_env, 0);
+ boot_jump_linux(images);
/* does not return */
return 1;