Module Name: src
Committed By: msaitoh
Date: Sun Dec 2 18:20:21 UTC 2012
Modified Files:
src/sys/arch/evbarm/marvell: marvell_machdep.c
Log Message:
Get bootargs and parse them. This was accidentally removed in rev. 1.17.
Fixes PR#47250.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/marvell/marvell_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.19 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.20
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.19 Mon Oct 22 15:43:32 2012
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Sun Dec 2 18:20:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.19 2012/10/22 15:43:32 matt Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.20 2012/12/02 18:20:20 msaitoh 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.19 2012/10/22 15:43:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.20 2012/12/02 18:20:20 msaitoh Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
@@ -375,6 +375,10 @@ initarm(void *arg)
/* we've a specific device_register routine */
evbarm_device_register = marvell_device_register;
+ /* parse bootargs from U-Boot */
+ boot_args = bootargs;
+ parse_mi_bootargs(boot_args);
+
return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
}