Mon Jul 6 10:22:44 2020 UTC ()
Drop unused opt_flash.h.


(rin)
diff -r1.6 -r1.7 src/sys/arch/powerpc/booke/dev/pq3cfi.c
diff -r1.3 -r1.4 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c
cvs diff -r1.6 -r1.7 src/sys/arch/powerpc/booke/dev/pq3cfi.c (expand / switch to unified diff)

--- src/sys/arch/powerpc/booke/dev/pq3cfi.c 2020/07/06 09:34:16 1.6
+++ src/sys/arch/powerpc/booke/dev/pq3cfi.c 2020/07/06 10:22:44 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pq3cfi.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */ 1/* $NetBSD: pq3cfi.c,v 1.7 2020/07/06 10:22:44 rin Exp $ */
2/*- 2/*-
3 * Copyright (c) 2011 The NetBSD Foundation, Inc. 3 * Copyright (c) 2011 The NetBSD Foundation, Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This code is derived from software contributed to The NetBSD Foundation 6 * This code is derived from software contributed to The NetBSD Foundation
7 * by Cliff Neighbors. 7 * by Cliff Neighbors.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -23,34 +23,30 @@ @@ -23,34 +23,30 @@
23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 23 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28 * POSSIBILITY OF SUCH DAMAGE. 28 * POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31/* 31/*
32 * NOR CFI driver support for booke 32 * NOR CFI driver support for booke
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.6 2020/07/06 09:34:16 rin Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.7 2020/07/06 10:22:44 rin Exp $");
37 37
38#include "locators.h" 38#include "locators.h"
39 39
40#ifdef _KERNEL_OPT 
41#include "opt_flash.h" 
42#endif 
43 
44#include <sys/param.h> 40#include <sys/param.h>
45#include <sys/systm.h> 41#include <sys/systm.h>
46#include <sys/cdefs.h> 42#include <sys/cdefs.h>
47#include <sys/device.h> 43#include <sys/device.h>
48#include <sys/endian.h> 44#include <sys/endian.h>
49 45
50#include <sys/bus.h> 46#include <sys/bus.h>
51 47
52#include <powerpc/booke/cpuvar.h> 48#include <powerpc/booke/cpuvar.h>
53 49
54#include <dev/nor/nor.h> 50#include <dev/nor/nor.h>
55#include <dev/nor/cfi.h> 51#include <dev/nor/cfi.h>
56 52
cvs diff -r1.3 -r1.4 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c (expand / switch to unified diff)

--- src/sys/arch/powerpc/booke/dev/pq3nandfcm.c 2020/07/06 09:34:16 1.3
+++ src/sys/arch/powerpc/booke/dev/pq3nandfcm.c 2020/07/06 10:22:44 1.4
@@ -20,31 +20,27 @@ @@ -20,31 +20,27 @@
20 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 20 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
21 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 21 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 22 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 23 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 24 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 25 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 26 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27 * POSSIBILITY OF SUCH DAMAGE. 27 * POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30#define LBC_PRIVATE 30#define LBC_PRIVATE
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.3 2020/07/06 09:34:16 rin Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.4 2020/07/06 10:22:44 rin Exp $");
34 
35#ifdef _KERNEL_OPT 
36#include "opt_flash.h" 
37#endif 
38 34
39#include <sys/param.h> 35#include <sys/param.h>
40#include <sys/systm.h> 36#include <sys/systm.h>
41#include <sys/device.h> 37#include <sys/device.h>
42#include <sys/cpu.h> 38#include <sys/cpu.h>
43 39
44#include <sys/bus.h> 40#include <sys/bus.h>
45 41
46#include <powerpc/booke/cpuvar.h> 42#include <powerpc/booke/cpuvar.h>
47#include <powerpc/booke/e500reg.h> 43#include <powerpc/booke/e500reg.h>
48#include <powerpc/booke/obiovar.h> 44#include <powerpc/booke/obiovar.h>
49 45
50#include <dev/nand/nand.h> 46#include <dev/nand/nand.h>