Module Name: src
Committed By: skrll
Date: Fri Aug 3 13:48:24 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
Added Files:
src/sys/arch/evbarm/fdt: machdep.h
Log Message:
Provide and use a evbarm/fdt/machdep.h
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/fdt/machdep.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/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.8 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.9
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.8 Mon Jul 16 23:11:47 2018
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Fri Aug 3 13:48:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.8 2018/07/16 23:11:47 christos Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.9 2018/08/03 13:48:24 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.8 2018/07/16 23:11:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.9 2018/08/03 13:48:24 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -64,9 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm283x_plat
#include <uvm/uvm_extern.h>
#include <machine/bootconfig.h>
-#ifdef __aarch64__
-#include <aarch64/machdep.h>
-#endif
+
#include <arm/armreg.h>
#include <arm/cpufunc.h>
@@ -81,6 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm283x_plat
#include <evbarm/dev/plcomreg.h>
#include <evbarm/dev/plcomvar.h>
+#include <evbarm/fdt/machdep.h>
#include <dev/ic/ns16550reg.h>
#include <dev/ic/comreg.h>
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.29 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.30
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.29 Fri Aug 3 12:48:33 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Fri Aug 3 13:48:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.29 2018/08/03 12:48:33 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.30 2018/08/03 13:48:24 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.29 2018/08/03 12:48:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.30 2018/08/03 13:48:24 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -68,14 +68,9 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#ifdef __aarch64__
-#include <aarch64/machdep.h>
-#else
-#include <arm/arm32/machdep.h>
-#endif
-
#include <evbarm/include/autoconf.h>
+#include <evbarm/fdt/machdep.h>
#include <evbarm/fdt/platform.h>
#include <arm/fdt/arm_fdtvar.h>
Added files:
Index: src/sys/arch/evbarm/fdt/machdep.h
diff -u /dev/null src/sys/arch/evbarm/fdt/machdep.h:1.1
--- /dev/null Fri Aug 3 13:48:24 2018
+++ src/sys/arch/evbarm/fdt/machdep.h Fri Aug 3 13:48:24 2018
@@ -0,0 +1,43 @@
+/* $NetBSD: machdep.h,v 1.1 2018/08/03 13:48:24 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _EVBARM_FDT_MACHDEP_H
+#define _EVBARM_FDT_MACHDEP_H
+
+#ifdef __aarch64__
+#include <aarch64/machdep.h>
+#endif
+
+#ifdef __arm__
+#include <arm/arm32/machdep.h>
+#endif
+
+#endif /* _EVBARM_FDT_MACHDEP_H */
