|
@@ -43,10 +43,27 @@ static int linux_env_idx;
|
|
static void linux_params_init(ulong start, char *commandline);
|
|
static void linux_params_init(ulong start, char *commandline);
|
|
static void linux_env_set(char *env_name, char *env_val);
|
|
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[],
|
|
int do_bootm_linux(int flag, int argc, char * const argv[],
|
|
bootm_headers_t *images)
|
|
bootm_headers_t *images)
|
|
{
|
|
{
|
|
- void (*theKernel) (int, char **, char **, int *);
|
|
|
|
char *commandline = getenv("bootargs");
|
|
char *commandline = getenv("bootargs");
|
|
char env_buf[12];
|
|
char env_buf[12];
|
|
char *cp;
|
|
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))
|
|
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
|
return 1;
|
|
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);
|
|
linux_params_init(UNCACHED_SDRAM(gd->bd->bi_boot_params), commandline);
|
|
|
|
|
|
#ifdef CONFIG_MEMSIZE_IN_BYTES
|
|
#ifdef CONFIG_MEMSIZE_IN_BYTES
|
|
@@ -95,10 +104,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
|
|
if (cp)
|
|
if (cp)
|
|
linux_env_set("eth1addr", 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 */
|
|
/* does not return */
|
|
return 1;
|
|
return 1;
|