Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the command line U-Boot gave us for boothowto. From evbarm/gumstix.

This commit is contained in:
jakllsch 2011-02-01 23:23:52 +00:00
parent 476e483aa2
commit bb246152ed
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/evbarm/marvell/marvell_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: marvell_machdep.c,v 1.3 2011/02/01 22:54:24 jakllsch Exp $ */ /* $NetBSD: marvell_machdep.c,v 1.4 2011/02/01 23:23:52 jakllsch Exp $ */
/* /*
* Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
* All rights reserved. * All rights reserved.
@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.3 2011/02/01 22:54:24 jakllsch Exp $"); __KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.4 2011/02/01 23:23:52 jakllsch Exp $");
#include "opt_evbarm_boardtype.h" #include "opt_evbarm_boardtype.h"
#include "opt_ddb.h" #include "opt_ddb.h"
@ -104,6 +104,7 @@ u_int cpu_reset_address = 0xffff0000;
#endif #endif
BootConfig bootconfig; /* Boot config storage */ BootConfig bootconfig; /* Boot config storage */
static char bootargs[MAX_BOOT_STRING];
char *boot_args = NULL; char *boot_args = NULL;
vm_offset_t physical_start; vm_offset_t physical_start;
@ -283,6 +284,7 @@ static const struct pmap_devmap marvell_devmap[] = {
#undef _A #undef _A
#undef _S #undef _S
extern uint32_t *u_boot_args[];
/* /*
* u_int initarm(...) * u_int initarm(...)
@ -430,6 +432,9 @@ initarm(void *arg)
#define _BDSTR(s) #s #define _BDSTR(s) #s
printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n"); printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n");
/* copy command line U-Boot gave us */
strncpy(bootargs, (char *)u_boot_args[3], sizeof(bootargs));
#ifdef VERBOSE_INIT_ARM #ifdef VERBOSE_INIT_ARM
printf("initarm: Configuring system ...\n"); printf("initarm: Configuring system ...\n");
#endif #endif
@ -753,6 +758,9 @@ initarm(void *arg)
md_root_setconf(memory_disk, sizeof memory_disk); md_root_setconf(memory_disk, sizeof memory_disk);
#endif #endif
boot_args = bootargs;
parse_mi_bootargs(boot_args);
#ifdef BOOTHOWTO #ifdef BOOTHOWTO
boothowto |= BOOTHOWTO; boothowto |= BOOTHOWTO;
#endif #endif