Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/fdt Fix build for some arm32 kernels; arm_simpl...



details:   https://anonhg.NetBSD.org/src/rev/c8ec062a4150
branches:  trunk
changeset: 945121:c8ec062a4150
user:      rin <rin%NetBSD.org@localhost>
date:      Wed Oct 21 11:06:13 2020 +0000

description:
Fix build for some arm32 kernels; arm_simplefb_reconfig() is used
only when NPCI > 0 && defined(PCI_NETBSD_CONFIGURE).

diffstat:

 sys/arch/arm/fdt/arm_simplefb.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 1b44a6b8096e -r c8ec062a4150 sys/arch/arm/fdt/arm_simplefb.c
--- a/sys/arch/arm/fdt/arm_simplefb.c   Wed Oct 21 11:02:31 2020 +0000
+++ b/sys/arch/arm/fdt/arm_simplefb.c   Wed Oct 21 11:06:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_simplefb.c,v 1.3 2020/10/20 23:03:30 jmcneill Exp $ */
+/* $NetBSD: arm_simplefb.c,v 1.4 2020/10/21 11:06:13 rin Exp $ */
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include "opt_pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_simplefb.c,v 1.3 2020/10/20 23:03:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_simplefb.c,v 1.4 2020/10/21 11:06:13 rin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -161,6 +161,7 @@
 {
 }
 
+#if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
 static void
 arm_simplefb_reconfig(void *arg, uint64_t new_addr)
 {
@@ -177,6 +178,7 @@
 
        arm_simplefb_addr = (bus_addr_t)new_addr;
 }
+#endif
 
 uint64_t
 arm_simplefb_physaddr(void)



Home | Main Index | Thread Index | Old Index