Module Name: src
Committed By: jakllsch
Date: Wed Aug 22 12:36:35 UTC 2012
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_obio.c
src/sys/arch/evbarm/rpi: rpi_machdep.c rpi_start.S
Log Message:
... and remove inclusion of defparam-created header.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcm2835_obio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/rpi/rpi_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/rpi/rpi_start.S
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/arm/broadcom/bcm2835_obio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_obio.c:1.4 src/sys/arch/arm/broadcom/bcm2835_obio.c:1.5
--- src/sys/arch/arm/broadcom/bcm2835_obio.c:1.4 Mon Aug 20 07:45:24 2012
+++ src/sys/arch/arm/broadcom/bcm2835_obio.c Wed Aug 22 12:36:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_obio.c,v 1.4 2012/08/20 07:45:24 skrll Exp $ */
+/* $NetBSD: bcm2835_obio.c,v 1.5 2012/08/22 12:36:35 jakllsch Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,9 +30,8 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.4 2012/08/20 07:45:24 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_obio.c,v 1.5 2012/08/22 12:36:35 jakllsch Exp $");
-#include "opt_broadcom.h"
#include "locators.h"
#include "obio.h"
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.5 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.6
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.5 Thu Aug 16 23:40:19 2012
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Wed Aug 22 12:36:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.5 2012/08/16 23:40:19 jakllsch Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.6 2012/08/22 12:36:35 jakllsch Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,10 +122,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.5 2012/08/16 23:40:19 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.6 2012/08/22 12:36:35 jakllsch Exp $");
#include "opt_evbarm_boardtype.h"
-#include "opt_broadcom.h"
#include <sys/param.h>
#include <sys/device.h>
Index: src/sys/arch/evbarm/rpi/rpi_start.S
diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.4 src/sys/arch/evbarm/rpi/rpi_start.S:1.5
--- src/sys/arch/evbarm/rpi/rpi_start.S:1.4 Thu Aug 16 23:40:19 2012
+++ src/sys/arch/evbarm/rpi/rpi_start.S Wed Aug 22 12:36:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_start.S,v 1.4 2012/08/16 23:40:19 jakllsch Exp $ */
+/* $NetBSD: rpi_start.S,v 1.5 2012/08/22 12:36:35 jakllsch Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
@@ -81,14 +81,13 @@
* SUCH DAMAGE.
*/
-#include "opt_broadcom.h"
#include "opt_cputypes.h"
#include <machine/asm.h>
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: rpi_start.S,v 1.4 2012/08/16 23:40:19 jakllsch Exp $")
+RCSID("$NetBSD: rpi_start.S,v 1.5 2012/08/22 12:36:35 jakllsch Exp $")
/* Location (in MiB) to put temporary MMU tables just below. */
/* Raspberry Pi start.elf will give us anywhere between 128MiB and 240MiB */
