[src/trunk]: src/sys/arch/evbarm/marvell Use the command line U-Boot gave us ...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b57a3af0b867
branches:  trunk
changeset: 761594:b57a3af0b867
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Feb 01 23:23:52 2011 +0000

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

diffstat:

 sys/arch/evbarm/marvell/marvell_machdep.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r 91d9cd765c08 -r b57a3af0b867 sys/arch/evbarm/marvell/marvell_machdep.c
--- a/sys/arch/evbarm/marvell/marvell_machdep.c Tue Feb 01 22:54:24 2011 +0000
+++ b/sys/arch/evbarm/marvell/marvell_machdep.c Tue Feb 01 23:23:52 2011 +0000
@@ -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
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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_ddb.h"
@@ -104,6 +104,7 @@
 #endif
 
 BootConfig bootconfig;         /* Boot config storage */
+static char bootargs[MAX_BOOT_STRING];
 char *boot_args = NULL;
 
 vm_offset_t physical_start;
@@ -283,6 +284,7 @@
 #undef  _A
 #undef  _S
 
+extern uint32_t *u_boot_args[];
 
 /*
  * u_int initarm(...)
@@ -430,6 +432,9 @@
 #define _BDSTR(s)      #s
        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
        printf("initarm: Configuring system ...\n");
 #endif
@@ -753,6 +758,9 @@
        md_root_setconf(memory_disk, sizeof memory_disk);
 #endif
 
+       boot_args = bootargs;
+       parse_mi_bootargs(boot_args);
+
 #ifdef BOOTHOWTO
        boothowto |= BOOTHOWTO;
 #endif