Module Name: src
Committed By: jmcneill
Date: Fri Jul 25 11:39:34 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: files.rpi
src/sys/arch/evbarm/rpi: rpi_machdep.c vcprop.h
Log Message:
bump VCPROP_MAXCMDLINE to 1024, use this instead of MAX_BOOT_STRING for sizing
boot_args, and allow for overriding VCPROP_MAXCMDLINE in kernel config. Fixes
cmdline parsing with newer firmware (required for B+)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/files.rpi
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/rpi/rpi_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/rpi/vcprop.h
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/conf/files.rpi
diff -u src/sys/arch/evbarm/conf/files.rpi:1.4 src/sys/arch/evbarm/conf/files.rpi:1.5
--- src/sys/arch/evbarm/conf/files.rpi:1.4 Thu Sep 5 07:08:09 2013
+++ src/sys/arch/evbarm/conf/files.rpi Fri Jul 25 11:39:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.rpi,v 1.4 2013/09/05 07:08:09 skrll Exp $
+# $NetBSD: files.rpi,v 1.5 2014/07/25 11:39:34 jmcneill Exp $
#
# Raspberry Pi
#
@@ -19,3 +19,6 @@ include "arch/arm/broadcom/files.bcm2835
device vcmbox: sysmon_envsys
attach vcmbox at bcmmboxbus
file arch/evbarm/rpi/rpi_vcmbox.c vcmbox
+
+# Maximum command-line length
+defparam opt_vcprop.h VCPROP_MAXCMDLINE
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.42 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.43
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.42 Wed Jul 16 23:54:32 2014
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Fri Jul 25 11:39:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.42 2014/07/16 23:54:32 jmcneill Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.43 2014/07/25 11:39:34 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,12 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.42 2014/07/16 23:54:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.43 2014/07/25 11:39:34 jmcneill Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_arm_debug.h"
+#include "opt_vcprop.h"
#include "sdhc.h"
#include "bcmdwctwo.h"
@@ -103,7 +104,7 @@ extern int KERNEL_BASE_phys[];
extern int KERNEL_BASE_virt[];
BootConfig bootconfig; /* Boot config storage */
-static char bootargs[MAX_BOOT_STRING];
+static char bootargs[VCPROP_MAXCMDLINE];
char *boot_args = NULL;
static void rpi_bootparams(void);
Index: src/sys/arch/evbarm/rpi/vcprop.h
diff -u src/sys/arch/evbarm/rpi/vcprop.h:1.8 src/sys/arch/evbarm/rpi/vcprop.h:1.9
--- src/sys/arch/evbarm/rpi/vcprop.h:1.8 Wed Apr 17 06:12:42 2013
+++ src/sys/arch/evbarm/rpi/vcprop.h Fri Jul 25 11:39:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vcprop.h,v 1.8 2013/04/17 06:12:42 skrll Exp $ */
+/* $NetBSD: vcprop.h,v 1.9 2014/07/25 11:39:34 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -36,6 +36,8 @@
#ifndef _EVBARM_RPI_VCPROP_H_
#define _EVBARM_RPI_VCPROP_H_
+#include "opt_vcprop.h"
+
struct vcprop_tag {
uint32_t vpt_tag;
#define VCPROPTAG_NULL 0x00000000
@@ -154,7 +156,9 @@ struct vcprop_tag_clock {
struct vcprop_clock clk[VCPROP_MAXCLOCKS];
};
-#define VCPROP_MAXCMDLINE 256
+#ifndef VCPROP_MAXCMDLINE
+#define VCPROP_MAXCMDLINE 1024
+#endif
struct vcprop_tag_cmdline {
struct vcprop_tag tag;
uint8_t cmdline[VCPROP_MAXCMDLINE];
