Module Name: src
Committed By: skrll
Date: Fri Nov 1 18:41:06 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: std.bcm53xx std.beagle std.cubie std.gemini
std.goldengate std.igepv2 std.imx31 std.n900 std.netwalker
std.overo std.rpi std.tisdp24xx
Log Message:
Remove the bogus CPPFLAGS+="-I$S/../../../include"
Prompted by the build problem reported by John Klos
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.bcm53xx
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/std.beagle \
src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.cubie \
src/sys/arch/evbarm/conf/std.goldengate
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.gemini \
src/sys/arch/evbarm/conf/std.imx31
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.igepv2 \
src/sys/arch/evbarm/conf/std.overo
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.n900
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/std.tisdp24xx
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/std.bcm53xx
diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.12 src/sys/arch/evbarm/conf/std.bcm53xx:1.13
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.12 Mon Oct 28 22:35:07 2013
+++ src/sys/arch/evbarm/conf/std.bcm53xx Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.12 2013/10/28 22:35:07 matt Exp $
+# $NetBSD: std.bcm53xx,v 1.13 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for BCM5301X options
@@ -30,7 +30,6 @@ makeoptions KERNEL_BASE_PHYS="0x60100000
makeoptions KERNEL_BASE_VIRT="0x80100000"
makeoptions LOADADDRESS="0x00100000"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.beagle
diff -u src/sys/arch/evbarm/conf/std.beagle:1.11 src/sys/arch/evbarm/conf/std.beagle:1.12
--- src/sys/arch/evbarm/conf/std.beagle:1.11 Sun Aug 18 05:20:47 2013
+++ src/sys/arch/evbarm/conf/std.beagle Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.beagle,v 1.11 2013/08/18 05:20:47 matt Exp $
+# $NetBSD: std.beagle,v 1.12 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for BEAGLEBOARD options
@@ -22,7 +22,6 @@ options FPU_VFP
makeoptions LOADADDRESS="0x80300000"
makeoptions BOARDTYPE="beagle"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.11 src/sys/arch/evbarm/conf/std.rpi:1.12
--- src/sys/arch/evbarm/conf/std.rpi:1.11 Tue Oct 15 09:07:48 2013
+++ src/sys/arch/evbarm/conf/std.rpi Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.rpi,v 1.11 2013/10/15 09:07:48 skrll Exp $
+# $NetBSD: std.rpi,v 1.12 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
@@ -18,7 +18,6 @@ options KERNEL_BASE_EXT=0xc0000000
options EVBARM_BOARDTYPE="rpi"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.rpi"
-makeoptions CPPFLAGS+="-I$S/../../../include"
makeoptions LOADADDRESS="0xc0008000"
options ARM_INTR_IMPL="<arch/arm/broadcom/bcm2835_intr.h>"
Index: src/sys/arch/evbarm/conf/std.cubie
diff -u src/sys/arch/evbarm/conf/std.cubie:1.1 src/sys/arch/evbarm/conf/std.cubie:1.2
--- src/sys/arch/evbarm/conf/std.cubie:1.1 Tue Sep 3 06:12:00 2013
+++ src/sys/arch/evbarm/conf/std.cubie Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.cubie,v 1.1 2013/09/03 06:12:00 matt Exp $
+# $NetBSD: std.cubie,v 1.2 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for CUBIEBOARD options
@@ -23,7 +23,6 @@ makeoptions KERNEL_BASE_PHYS="0x40007800
makeoptions KERNEL_BASE_VIRT="0x80007800"
makeoptions BOARDTYPE="cubie"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.cubie"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/allwinner/awin_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.goldengate
diff -u src/sys/arch/evbarm/conf/std.goldengate:1.1 src/sys/arch/evbarm/conf/std.goldengate:1.2
--- src/sys/arch/evbarm/conf/std.goldengate:1.1 Tue Feb 19 16:12:36 2013
+++ src/sys/arch/evbarm/conf/std.goldengate Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.goldengate,v 1.1 2013/02/19 16:12:36 matt Exp $
+# $NetBSD: std.goldengate,v 1.2 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for Cortina GoldenGate (CS75xx) options
@@ -25,7 +25,6 @@ options EVBARM_BOARDTYPE="goldengate"
makeoptions LOADADDRESS_VIRT="0x80008000"
makeoptions LOADADDRESS="0x8000"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.goldengate"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/cortina/g2_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.gemini
diff -u src/sys/arch/evbarm/conf/std.gemini:1.7 src/sys/arch/evbarm/conf/std.gemini:1.8
--- src/sys/arch/evbarm/conf/std.gemini:1.7 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.gemini Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.gemini,v 1.7 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.gemini,v 1.8 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for GEMINI options
@@ -18,7 +18,6 @@ makeoptions KERNEL_BASE_VIRT="0x80200000
makeoptions LOADADDRESS="0x00200000"
makeoptions BOARDTYPE="gemini"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gemini"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options EVBARM_BOARDTYPE=gemini
options ARM_INTR_IMPL="<arch/arm/gemini/gemini_intr.h>"
Index: src/sys/arch/evbarm/conf/std.imx31
diff -u src/sys/arch/evbarm/conf/std.imx31:1.7 src/sys/arch/evbarm/conf/std.imx31:1.8
--- src/sys/arch/evbarm/conf/std.imx31:1.7 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.imx31 Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.imx31,v 1.7 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.imx31,v 1.8 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm options for FreeScale I.MX31
@@ -17,7 +17,6 @@ options ARM11_CACHE_WRITE_THROUGH
makeoptions LOADADDRESS="0x80100000"
makeoptions BOARDTYPE="imx31"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx31"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/imx/imx31_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.igepv2
diff -u src/sys/arch/evbarm/conf/std.igepv2:1.5 src/sys/arch/evbarm/conf/std.igepv2:1.6
--- src/sys/arch/evbarm/conf/std.igepv2:1.5 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.igepv2 Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.igepv2,v 1.5 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.igepv2,v 1.6 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for IGEPV2 options
@@ -18,7 +18,6 @@ options KERNEL_BASE_EXT=0x80000000
makeoptions LOADADDRESS="0x80300000"
makeoptions BOARDTYPE="igepv2"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.overo
diff -u src/sys/arch/evbarm/conf/std.overo:1.5 src/sys/arch/evbarm/conf/std.overo:1.6
--- src/sys/arch/evbarm/conf/std.overo:1.5 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.overo Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.overo,v 1.5 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.overo,v 1.6 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for OVERO options
@@ -16,7 +16,6 @@ makeoptions LOADADDRESS="0x80200000"
makeoptions BOARDTYPE="overo"
options EVBARM_BOARDTYPE=overo
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.n900
diff -u src/sys/arch/evbarm/conf/std.n900:1.3 src/sys/arch/evbarm/conf/std.n900:1.4
--- src/sys/arch/evbarm/conf/std.n900:1.3 Sun Apr 14 18:57:32 2013
+++ src/sys/arch/evbarm/conf/std.n900 Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.n900,v 1.3 2013/04/14 18:57:32 khorben Exp $
+# $NetBSD: std.n900,v 1.4 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for N900 options
@@ -19,7 +19,6 @@ options FPU_VFP
makeoptions LOADADDRESS="0x80300000"
makeoptions BOARDTYPE="n900"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.6 src/sys/arch/evbarm/conf/std.netwalker:1.7
--- src/sys/arch/evbarm/conf/std.netwalker:1.6 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.netwalker Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwalker,v 1.6 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.netwalker,v 1.7 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
@@ -20,7 +20,6 @@ options CORTEX_PMC_CCNT_HZ=800000000
makeoptions LOADADDRESS="0x90100000"
makeoptions BOARDTYPE="netwalker"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.netwalker"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/imx/imx51_intr.h>"
options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.tisdp24xx
diff -u src/sys/arch/evbarm/conf/std.tisdp24xx:1.8 src/sys/arch/evbarm/conf/std.tisdp24xx:1.9
--- src/sys/arch/evbarm/conf/std.tisdp24xx:1.8 Sun Dec 16 23:47:57 2012
+++ src/sys/arch/evbarm/conf/std.tisdp24xx Fri Nov 1 18:41:06 2013
@@ -1,4 +1,4 @@
-# $NetBSD: std.tisdp24xx,v 1.8 2012/12/16 23:47:57 matt Exp $
+# $NetBSD: std.tisdp24xx,v 1.9 2013/11/01 18:41:06 skrll Exp $
#
# standard NetBSD/evbarm for SDP2430 options
@@ -19,7 +19,6 @@ makeoptions LOADADDRESS="0x80300000"
#makeoptions LOADADDRESS="0xc0000000"
makeoptions BOARDTYPE="sdp2430"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tisdp24xx"
-makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
options ARM_GENERIC_TODR
