mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-20 22:21:41 +00:00
MIPS: bootm.c: separate environment initialization
Move the environment initialization 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>
This commit is contained in:
parent
e08634c7bf
commit
0ea7213f63
1 changed files with 27 additions and 23 deletions
|
@ -43,34 +43,12 @@ 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)
|
static void boot_prep_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)
|
|
||||||
{
|
{
|
||||||
char *commandline = getenv("bootargs");
|
char *commandline = getenv("bootargs");
|
||||||
char env_buf[12];
|
char env_buf[12];
|
||||||
char *cp;
|
char *cp;
|
||||||
|
|
||||||
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
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
|
||||||
|
@ -103,7 +81,33 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
|
||||||
cp = getenv("eth1addr");
|
cp = getenv("eth1addr");
|
||||||
if (cp)
|
if (cp)
|
||||||
linux_env_set("eth1addr", cp);
|
linux_env_set("eth1addr", cp);
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
boot_prep_linux(images);
|
||||||
boot_jump_linux(images);
|
boot_jump_linux(images);
|
||||||
|
|
||||||
/* does not return */
|
/* does not return */
|
||||||
|
|
Loading…
Add table
Reference in a new issue