Module Name: src
Committed By: matt
Date: Sun Dec 16 23:47:57 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: std.adi_brh std.armadillo9 std.bcm53xx
std.beagle std.cp3100 std.g42xxeb std.gemini std.gumstix std.hdl_g
std.igepv2 std.imx23_olinuxino std.imx31 std.integrator std.iq31244
std.iq80310 std.iq80321 std.ixdp425 std.ixm1200 std.lubbock
std.marvell std.mini2440 std.mmnet std.mpcsa std.mv2120 std.n900
std.netwalker std.npwr_fc std.nslu2 std.osk5912 std.overo std.rpi
std.smdk2410 std.smdk2800 std.tisdp24xx std.tsarm std.viper
Log Message:
Use a std.evarm to handle the normal EXEC_ELF32/EXEC_SCRIPT and ARM options
as well as include conf/std and std.arm
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.adi_brh \
src/sys/arch/evbarm/conf/std.bcm53xx src/sys/arch/evbarm/conf/std.iq31244 \
src/sys/arch/evbarm/conf/std.lubbock
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.armadillo9 \
src/sys/arch/evbarm/conf/std.gemini src/sys/arch/evbarm/conf/std.imx31 \
src/sys/arch/evbarm/conf/std.smdk2410
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/std.beagle \
src/sys/arch/evbarm/conf/std.gumstix
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.cp3100 \
src/sys/arch/evbarm/conf/std.hdl_g src/sys/arch/evbarm/conf/std.igepv2 \
src/sys/arch/evbarm/conf/std.nslu2 src/sys/arch/evbarm/conf/std.osk5912 \
src/sys/arch/evbarm/conf/std.overo
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.g42xxeb \
src/sys/arch/evbarm/conf/std.tisdp24xx src/sys/arch/evbarm/conf/std.tsarm \
src/sys/arch/evbarm/conf/std.viper
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.imx23_olinuxino \
src/sys/arch/evbarm/conf/std.marvell \
src/sys/arch/evbarm/conf/std.mini2440 src/sys/arch/evbarm/conf/std.mpcsa \
src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/std.integrator
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/std.iq80310
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/std.iq80321 \
src/sys/arch/evbarm/conf/std.smdk2800
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/std.ixdp425
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.ixm1200
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.mmnet \
src/sys/arch/evbarm/conf/std.mv2120 src/sys/arch/evbarm/conf/std.n900
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.netwalker \
src/sys/arch/evbarm/conf/std.npwr_fc
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.adi_brh
diff -u src/sys/arch/evbarm/conf/std.adi_brh:1.9 src/sys/arch/evbarm/conf/std.adi_brh:1.10
--- src/sys/arch/evbarm/conf/std.adi_brh:1.9 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.adi_brh Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.adi_brh,v 1.9 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.adi_brh,v 1.10 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for ADI BRH options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in ADI BRH config definitions.
-include "arch/evbarm/conf/files.adi_brh"
+include "arch/evbarm/conf/files.adi_brh"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
Index: src/sys/arch/evbarm/conf/std.bcm53xx
diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.9 src/sys/arch/evbarm/conf/std.bcm53xx:1.10
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.9 Sun Dec 16 20:44:16 2012
+++ src/sys/arch/evbarm/conf/std.bcm53xx Sun Dec 16 23:47:56 2012
@@ -1,6 +1,6 @@
-# $NetBSD: std.bcm53xx,v 1.9 2012/12/16 20:44:16 matt Exp $
+# $NetBSD: std.bcm53xx,v 1.10 2012/12/16 23:47:56 matt Exp $
#
-# standard NetBSD/evbarm for BEAGLEBAORD options
+# standard NetBSD/evbarm for BCM5301X options
machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
Index: src/sys/arch/evbarm/conf/std.iq31244
diff -u src/sys/arch/evbarm/conf/std.iq31244:1.9 src/sys/arch/evbarm/conf/std.iq31244:1.10
--- src/sys/arch/evbarm/conf/std.iq31244:1.9 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.iq31244 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.iq31244,v 1.9 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.iq31244,v 1.10 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IQ31244 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in IQ31244 config definitions.
-include "arch/evbarm/conf/files.iq31244"
+include "arch/evbarm/conf/files.iq31244"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.lubbock
diff -u src/sys/arch/evbarm/conf/std.lubbock:1.9 src/sys/arch/evbarm/conf/std.lubbock:1.10
--- src/sys/arch/evbarm/conf/std.lubbock:1.9 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.lubbock Sun Dec 16 23:47:56 2012
@@ -1,20 +1,15 @@
-# $NetBSD: std.lubbock,v 1.9 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.lubbock,v 1.10 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for LUBBOCK options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in LUBBOCK config definitions.
-include "arch/evbarm/conf/files.lubbock"
+include "arch/evbarm/conf/files.lubbock"
options COTULLA
options LUBBOCK
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
Index: src/sys/arch/evbarm/conf/std.armadillo9
diff -u src/sys/arch/evbarm/conf/std.armadillo9:1.6 src/sys/arch/evbarm/conf/std.armadillo9:1.7
--- src/sys/arch/evbarm/conf/std.armadillo9:1.6 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.armadillo9 Sun Dec 16 23:47:56 2012
@@ -1,20 +1,12 @@
-# $NetBSD: std.armadillo9,v 1.6 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.armadillo9,v 1.7 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for Armadillo9 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in armadillo9 config definitions.
-include "arch/evbarm/conf/files.armadillo9"
-
-
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
-
+include "arch/evbarm/conf/files.armadillo9"
makeoptions BOARDTYPE="armadillo9"
options KERNEL_BASE_EXT=0xc0000000
Index: src/sys/arch/evbarm/conf/std.gemini
diff -u src/sys/arch/evbarm/conf/std.gemini:1.6 src/sys/arch/evbarm/conf/std.gemini:1.7
--- src/sys/arch/evbarm/conf/std.gemini:1.6 Thu Nov 20 07:45:37 2008
+++ src/sys/arch/evbarm/conf/std.gemini Sun Dec 16 23:47:56 2012
@@ -1,18 +1,14 @@
-# $NetBSD: std.gemini,v 1.6 2008/11/20 07:45:37 cliff Exp $
+# $NetBSD: std.gemini,v 1.7 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for GEMINI options
machine evbarm arm
-include "conf/std" # MI standard options
-
+include "arch/evbarm/conf/std.evbarm"
+
# Pull in GEMINI config definitions.
-include "arch/evbarm/conf/files.gemini"
-
-options EXEC_ELF32
-options EXEC_SCRIPT
+include "arch/evbarm/conf/files.gemini"
# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM9
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_PCI_CONF_HOOK # should be in types.h
Index: src/sys/arch/evbarm/conf/std.imx31
diff -u src/sys/arch/evbarm/conf/std.imx31:1.6 src/sys/arch/evbarm/conf/std.imx31:1.7
--- src/sys/arch/evbarm/conf/std.imx31:1.6 Mon Dec 10 05:01:43 2012
+++ src/sys/arch/evbarm/conf/std.imx31 Sun Dec 16 23:47:56 2012
@@ -1,21 +1,16 @@
-# $NetBSD: std.imx31,v 1.6 2012/12/10 05:01:43 matt Exp $
+# $NetBSD: std.imx31,v 1.7 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm options for FreeScale I.MX31
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx31 config definitions.
-include "arch/evbarm/conf/files.imx31"
+include "arch/evbarm/conf/files.imx31"
-options EXEC_ELF32
-options EXEC_SCRIPT
options KERNEL_BASE_EXT=0x80000000
makeoptions CPUFLAGS="-march=armv6k -mtune=arm1136j-s -mfpu=vfp"
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM11_PMC
options ARM11_CACHE_WRITE_THROUGH
Index: src/sys/arch/evbarm/conf/std.smdk2410
diff -u src/sys/arch/evbarm/conf/std.smdk2410:1.6 src/sys/arch/evbarm/conf/std.smdk2410:1.7
--- src/sys/arch/evbarm/conf/std.smdk2410:1.6 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.smdk2410 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.smdk2410,v 1.6 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.smdk2410,v 1.7 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for SMDK2410 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Config definitions for SMDK2410
-include "arch/evbarm/conf/files.smdk2410"
+include "arch/evbarm/conf/files.smdk2410"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.beagle
diff -u src/sys/arch/evbarm/conf/std.beagle:1.8 src/sys/arch/evbarm/conf/std.beagle:1.9
--- src/sys/arch/evbarm/conf/std.beagle:1.8 Wed Dec 12 00:04:21 2012
+++ src/sys/arch/evbarm/conf/std.beagle Sun Dec 16 23:47:56 2012
@@ -1,19 +1,15 @@
-# $NetBSD: std.beagle,v 1.8 2012/12/12 00:04:21 matt Exp $
+# $NetBSD: std.beagle,v 1.9 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for BEAGLEBOARD options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in BEAGLEBOARD config definitions.
-include "arch/evbarm/conf/files.beagle"
-
-options EXEC_ELF32
-options EXEC_SCRIPT
+include "arch/evbarm/conf/files.beagle"
# To support easy transit to ../arch/arm/arm32
options __HAVE_CPU_COUNTER
-options ARM32
options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
Index: src/sys/arch/evbarm/conf/std.gumstix
diff -u src/sys/arch/evbarm/conf/std.gumstix:1.8 src/sys/arch/evbarm/conf/std.gumstix:1.9
--- src/sys/arch/evbarm/conf/std.gumstix:1.8 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.gumstix Sun Dec 16 23:47:56 2012
@@ -1,18 +1,12 @@
-# $NetBSD: std.gumstix,v 1.8 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.gumstix,v 1.9 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for GUMSTIX options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.gumstix"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
-
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
makeoptions BOARDTYPE="gumstix"
Index: src/sys/arch/evbarm/conf/std.cp3100
diff -u src/sys/arch/evbarm/conf/std.cp3100:1.4 src/sys/arch/evbarm/conf/std.cp3100:1.5
--- src/sys/arch/evbarm/conf/std.cp3100:1.4 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.cp3100 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.cp3100,v 1.4 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.cp3100,v 1.5 2012/12/16 23:47:56 matt Exp $
#
# Standard NetBSD/evbarm options for CP3100
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in CP3100 config definitions.
-include "arch/evbarm/conf/files.cp3100"
+include "arch/evbarm/conf/files.cp3100"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options KERNEL_BASE_EXT=0xc0000000
makeoptions BOARDTYPE="cp3100"
Index: src/sys/arch/evbarm/conf/std.hdl_g
diff -u src/sys/arch/evbarm/conf/std.hdl_g:1.4 src/sys/arch/evbarm/conf/std.hdl_g:1.5
--- src/sys/arch/evbarm/conf/std.hdl_g:1.4 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.hdl_g Sun Dec 16 23:47:56 2012
@@ -1,19 +1,13 @@
-# $NetBSD: std.hdl_g,v 1.4 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.hdl_g,v 1.5 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for I-O DATA HDL-G options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in HDL-G config definitions.
include "arch/evbarm/conf/files.hdl_g"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
-
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
makeoptions BOARDTYPE="hdlg"
Index: src/sys/arch/evbarm/conf/std.igepv2
diff -u src/sys/arch/evbarm/conf/std.igepv2:1.4 src/sys/arch/evbarm/conf/std.igepv2:1.5
--- src/sys/arch/evbarm/conf/std.igepv2:1.4 Tue Sep 4 00:19:20 2012
+++ src/sys/arch/evbarm/conf/std.igepv2 Sun Dec 16 23:47:56 2012
@@ -1,18 +1,13 @@
-# $NetBSD: std.igepv2,v 1.4 2012/09/04 00:19:20 matt Exp $
+# $NetBSD: std.igepv2,v 1.5 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IGEPV2 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in BEAGLEBOARD config definitions.
-include "arch/evbarm/conf/files.beagle"
+include "arch/evbarm/conf/files.beagle"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options CORTEX_PMC
options __HAVE_CPU_COUNTER
options __HAVE_FAST_SOFTINTS # should be in types.h
Index: src/sys/arch/evbarm/conf/std.nslu2
diff -u src/sys/arch/evbarm/conf/std.nslu2:1.4 src/sys/arch/evbarm/conf/std.nslu2:1.5
--- src/sys/arch/evbarm/conf/std.nslu2:1.4 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.nslu2 Sun Dec 16 23:47:56 2012
@@ -1,16 +1,12 @@
-# $NetBSD: std.nslu2,v 1.4 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.nslu2,v 1.5 2012/12/16 23:47:56 matt Exp $
#
# Standard NetBSD/evbarm options for Linksys NSLU2
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in NSLU2 config definitions.
-include "arch/evbarm/conf/files.nslu2"
-
-options EXEC_ELF32
-options EXEC_SCRIPT
-options ARM32
+include "arch/evbarm/conf/files.nslu2"
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
Index: src/sys/arch/evbarm/conf/std.osk5912
diff -u src/sys/arch/evbarm/conf/std.osk5912:1.4 src/sys/arch/evbarm/conf/std.osk5912:1.5
--- src/sys/arch/evbarm/conf/std.osk5912:1.4 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.osk5912 Sun Dec 16 23:47:56 2012
@@ -1,18 +1,12 @@
-# $NetBSD: std.osk5912,v 1.4 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.osk5912,v 1.5 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for OSK5912 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in OSK5912 config definitions.
-include "arch/evbarm/conf/files.osk5912"
-
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
+include "arch/evbarm/conf/files.osk5912"
makeoptions LOADADDRESS="0x80000000"
makeoptions BOARDTYPE="osk5912"
Index: src/sys/arch/evbarm/conf/std.overo
diff -u src/sys/arch/evbarm/conf/std.overo:1.4 src/sys/arch/evbarm/conf/std.overo:1.5
--- src/sys/arch/evbarm/conf/std.overo:1.4 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.overo Sun Dec 16 23:47:56 2012
@@ -1,17 +1,12 @@
-# $NetBSD: std.overo,v 1.4 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.overo,v 1.5 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for OVERO options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.overo"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
#options TPIDRPRW_IS_CURLWP
Index: src/sys/arch/evbarm/conf/std.g42xxeb
diff -u src/sys/arch/evbarm/conf/std.g42xxeb:1.7 src/sys/arch/evbarm/conf/std.g42xxeb:1.8
--- src/sys/arch/evbarm/conf/std.g42xxeb:1.7 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.g42xxeb Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.g42xxeb,v 1.7 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.g42xxeb,v 1.8 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for TWINTAIL (G4255EB) options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in LUBBOCK config definitions.
-include "arch/evbarm/conf/files.g42xxeb"
+include "arch/evbarm/conf/files.g42xxeb"
options G42XXEB
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
Index: src/sys/arch/evbarm/conf/std.tisdp24xx
diff -u src/sys/arch/evbarm/conf/std.tisdp24xx:1.7 src/sys/arch/evbarm/conf/std.tisdp24xx:1.8
--- src/sys/arch/evbarm/conf/std.tisdp24xx:1.7 Wed Aug 29 07:14:06 2012
+++ src/sys/arch/evbarm/conf/std.tisdp24xx Sun Dec 16 23:47:57 2012
@@ -1,18 +1,13 @@
-# $NetBSD: std.tisdp24xx,v 1.7 2012/08/29 07:14:06 matt Exp $
+# $NetBSD: std.tisdp24xx,v 1.8 2012/12/16 23:47:57 matt Exp $
#
# standard NetBSD/evbarm for SDP2430 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in SDP2430 config definitions.
-include "arch/evbarm/conf/files.tisdp24xx"
+include "arch/evbarm/conf/files.tisdp24xx"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM11_PMC
options ARM11_PMC_CCNT_HZ=266000000
options __HAVE_FAST_SOFTINTS # should be in types.h
Index: src/sys/arch/evbarm/conf/std.tsarm
diff -u src/sys/arch/evbarm/conf/std.tsarm:1.7 src/sys/arch/evbarm/conf/std.tsarm:1.8
--- src/sys/arch/evbarm/conf/std.tsarm:1.7 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.tsarm Sun Dec 16 23:47:57 2012
@@ -1,23 +1,17 @@
-# $NetBSD: std.tsarm,v 1.7 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.tsarm,v 1.8 2012/12/16 23:47:57 matt Exp $
#
# standard NetBSD/evbarm for TS7200 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in tsarm config definitions.
-include "arch/evbarm/conf/files.tsarm"
+include "arch/evbarm/conf/files.tsarm"
-
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options HZ=64
-
makeoptions BOARDTYPE="tsarm"
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
Index: src/sys/arch/evbarm/conf/std.viper
diff -u src/sys/arch/evbarm/conf/std.viper:1.7 src/sys/arch/evbarm/conf/std.viper:1.8
--- src/sys/arch/evbarm/conf/std.viper:1.7 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.viper Sun Dec 16 23:47:57 2012
@@ -1,17 +1,12 @@
-# $NetBSD: std.viper,v 1.7 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.viper,v 1.8 2012/12/16 23:47:57 matt Exp $
#
# Arcom Viper standard kernel options
#
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
-include "arch/evbarm/conf/files.viper"
-
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-options ARM32
+include "arch/evbarm/conf/files.viper"
options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
Index: src/sys/arch/evbarm/conf/std.imx23_olinuxino
diff -u src/sys/arch/evbarm/conf/std.imx23_olinuxino:1.2 src/sys/arch/evbarm/conf/std.imx23_olinuxino:1.3
--- src/sys/arch/evbarm/conf/std.imx23_olinuxino:1.2 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.imx23_olinuxino Sun Dec 16 23:47:56 2012
@@ -1,15 +1,12 @@
-# $Id: std.imx23_olinuxino,v 1.2 2012/12/16 20:38:14 matt Exp $
+# $Id: std.imx23_olinuxino,v 1.3 2012/12/16 23:47:56 matt Exp $
#
# IMX23_OLINUXINO standard kernel options.
machine evbarm arm
-include "conf/std" # Standard MI options.
+include "arch/evbarm/conf/std.evbarm"
-options EXEC_ELF32
options CPU_ARM9E
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM_INTR_IMPL="<arch/arm/imx/imx23_intr.h>"
options EVBARM_BOARDTYPE=OLinuXino
options KERNEL_BASE_EXT=0x40000000
Index: src/sys/arch/evbarm/conf/std.marvell
diff -u src/sys/arch/evbarm/conf/std.marvell:1.2 src/sys/arch/evbarm/conf/std.marvell:1.3
--- src/sys/arch/evbarm/conf/std.marvell:1.2 Sun Sep 2 13:34:50 2012
+++ src/sys/arch/evbarm/conf/std.marvell Sun Dec 16 23:47:56 2012
@@ -1,17 +1,12 @@
-# $NetBSD: std.marvell,v 1.2 2012/09/02 13:34:50 matt Exp $
+# $NetBSD: std.marvell,v 1.3 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for MAEVELL options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.marvell"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options __HAVE_PCI_CONF_HOOK # should be in types.h
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
Index: src/sys/arch/evbarm/conf/std.mini2440
diff -u src/sys/arch/evbarm/conf/std.mini2440:1.2 src/sys/arch/evbarm/conf/std.mini2440:1.3
--- src/sys/arch/evbarm/conf/std.mini2440:1.2 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.mini2440 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.mini2440,v 1.2 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.mini2440,v 1.3 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for MINI2440 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Config definitions for MINI2440
-include "arch/evbarm/conf/files.mini2440"
+include "arch/evbarm/conf/files.mini2440"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.mpcsa
diff -u src/sys/arch/evbarm/conf/std.mpcsa:1.2 src/sys/arch/evbarm/conf/std.mpcsa:1.3
--- src/sys/arch/evbarm/conf/std.mpcsa:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/evbarm/conf/std.mpcsa Sun Dec 16 23:47:56 2012
@@ -1,21 +1,18 @@
+# $NetBSD: std.mpcsa,v 1.3 2012/12/16 23:47:56 matt Exp $
#
# NetBSD/evbarm options for MPCSA evaluation board
#
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in MPCSA config definitions.
include "arch/evbarm/conf/files.mpcsa"
options AT91RM9200 # enable AT91RM9200 support
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM_GENERIC_TODR
# timer speed
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.2 src/sys/arch/evbarm/conf/std.rpi:1.3
--- src/sys/arch/evbarm/conf/std.rpi:1.2 Sat Sep 1 17:11:56 2012
+++ src/sys/arch/evbarm/conf/std.rpi Sun Dec 16 23:47:56 2012
@@ -1,18 +1,13 @@
-# $NetBSD: std.rpi,v 1.2 2012/09/01 17:11:56 skrll Exp $
+# $NetBSD: std.rpi,v 1.3 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in Raspberry Pi config definitions.
-include "arch/evbarm/conf/files.rpi"
+include "arch/evbarm/conf/files.rpi"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options TPIDRPRW_IS_CURCPU
Index: src/sys/arch/evbarm/conf/std.integrator
diff -u src/sys/arch/evbarm/conf/std.integrator:1.17 src/sys/arch/evbarm/conf/std.integrator:1.18
--- src/sys/arch/evbarm/conf/std.integrator:1.17 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.integrator Sun Dec 16 23:47:56 2012
@@ -1,19 +1,15 @@
-# $NetBSD: std.integrator,v 1.17 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.integrator,v 1.18 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/integrator options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in Integrator config definitions.
-include "arch/evbarm/conf/files.integrator"
+include "arch/evbarm/conf/files.integrator"
options EXEC_AOUT
-options EXEC_SCRIPT
-options EXEC_ELF32
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options _ARM32_NEED_BUS_DMA_BOUNCE
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.iq80310
diff -u src/sys/arch/evbarm/conf/std.iq80310:1.22 src/sys/arch/evbarm/conf/std.iq80310:1.23
--- src/sys/arch/evbarm/conf/std.iq80310:1.22 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.iq80310 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.iq80310,v 1.22 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.iq80310,v 1.23 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IQ80310 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in IQ80310 config definitions.
-include "arch/evbarm/conf/files.iq80310"
+include "arch/evbarm/conf/files.iq80310"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options KERNEL_BASE_EXT=0xc0000000
makeoptions BOARDTYPE="iq80310"
Index: src/sys/arch/evbarm/conf/std.iq80321
diff -u src/sys/arch/evbarm/conf/std.iq80321:1.14 src/sys/arch/evbarm/conf/std.iq80321:1.15
--- src/sys/arch/evbarm/conf/std.iq80321:1.14 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.iq80321 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.iq80321,v 1.14 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.iq80321,v 1.15 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IQ80321 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in IQ80321 config definitions.
-include "arch/evbarm/conf/files.iq80321"
+include "arch/evbarm/conf/files.iq80321"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.smdk2800
diff -u src/sys/arch/evbarm/conf/std.smdk2800:1.14 src/sys/arch/evbarm/conf/std.smdk2800:1.15
--- src/sys/arch/evbarm/conf/std.smdk2800:1.14 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.smdk2800 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.smdk2800,v 1.14 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.smdk2800,v 1.15 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for SMDK2800 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Config definitions for SMDK2800
-include "arch/evbarm/conf/files.smdk2800"
+include "arch/evbarm/conf/files.smdk2800"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM9_CACHE_WRITE_THROUGH # we have problem with WB dcache
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.ixdp425
diff -u src/sys/arch/evbarm/conf/std.ixdp425:1.11 src/sys/arch/evbarm/conf/std.ixdp425:1.12
--- src/sys/arch/evbarm/conf/std.ixdp425:1.11 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.ixdp425 Sun Dec 16 23:47:56 2012
@@ -1,17 +1,14 @@
-# $NetBSD: std.ixdp425,v 1.11 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.ixdp425,v 1.12 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IXDP425 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in IXDP425 config definitions.
-include "arch/evbarm/conf/files.ixdp425"
+include "arch/evbarm/conf/files.ixdp425"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-options ARM32
options COM_PXA2X0 # Enable IXP Uart support in com(4)
Index: src/sys/arch/evbarm/conf/std.ixm1200
diff -u src/sys/arch/evbarm/conf/std.ixm1200:1.13 src/sys/arch/evbarm/conf/std.ixm1200:1.14
--- src/sys/arch/evbarm/conf/std.ixm1200:1.13 Sun Dec 16 20:38:14 2012
+++ src/sys/arch/evbarm/conf/std.ixm1200 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.ixm1200,v 1.13 2012/12/16 20:38:14 matt Exp $
+# $NetBSD: std.ixm1200,v 1.14 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IXM1200 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in IXM1200 config definitions.
-include "arch/evbarm/conf/files.ixm1200"
+include "arch/evbarm/conf/files.ixm1200"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
Index: src/sys/arch/evbarm/conf/std.mmnet
diff -u src/sys/arch/evbarm/conf/std.mmnet:1.1 src/sys/arch/evbarm/conf/std.mmnet:1.2
--- src/sys/arch/evbarm/conf/std.mmnet:1.1 Fri Nov 4 17:40:48 2011
+++ src/sys/arch/evbarm/conf/std.mmnet Sun Dec 16 23:47:56 2012
@@ -1,21 +1,18 @@
+# $NetBSD: std.mmnet,v 1.2 2012/12/16 23:47:56 matt Exp $
#
# NetBSD/evbarm options for Propox MMnet1002 evaluation board
#
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in MMnet config definitions.
include "arch/evbarm/conf/files.mmnet"
options AT91SAM9260
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options ARM_GENERIC_TODR
# timer speed
Index: src/sys/arch/evbarm/conf/std.mv2120
diff -u src/sys/arch/evbarm/conf/std.mv2120:1.1 src/sys/arch/evbarm/conf/std.mv2120:1.2
--- src/sys/arch/evbarm/conf/std.mv2120:1.1 Wed Jul 20 22:53:38 2011
+++ src/sys/arch/evbarm/conf/std.mv2120 Sun Dec 16 23:47:56 2012
@@ -1,17 +1,12 @@
-# $NetBSD: std.mv2120,v 1.1 2011/07/20 22:53:38 jakllsch Exp $
+# $NetBSD: std.mv2120,v 1.2 2012/12/16 23:47:56 matt Exp $
#
-# standard NetBSD/evbarm for MAEVELL options
+# standard NetBSD/evbarm for MARVELL options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.marvell"
-options EXEC_ELF32
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
options __HAVE_PCI_CONF_HOOK # should be in types.h
options COM_REGMAP
Index: src/sys/arch/evbarm/conf/std.n900
diff -u src/sys/arch/evbarm/conf/std.n900:1.1 src/sys/arch/evbarm/conf/std.n900:1.2
--- src/sys/arch/evbarm/conf/std.n900:1.1 Fri Dec 7 00:02:36 2012
+++ src/sys/arch/evbarm/conf/std.n900 Sun Dec 16 23:47:56 2012
@@ -1,19 +1,15 @@
-# $NetBSD: std.n900,v 1.1 2012/12/07 00:02:36 khorben Exp $
+# $NetBSD: std.n900,v 1.2 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for N900 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in BEAGLEBOARD config definitions.
-include "arch/evbarm/conf/files.beagle"
-
-options EXEC_ELF32
-options EXEC_SCRIPT
+include "arch/evbarm/conf/files.beagle"
# To support easy transit to ../arch/arm/arm32
options __HAVE_CPU_COUNTER
-options ARM32
options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
options TPIDRPRW_IS_CURCPU
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.5 src/sys/arch/evbarm/conf/std.netwalker:1.6
--- src/sys/arch/evbarm/conf/std.netwalker:1.5 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.netwalker Sun Dec 16 23:47:56 2012
@@ -1,22 +1,19 @@
-# $NetBSD: std.netwalker,v 1.5 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.netwalker,v 1.6 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx51 config definitions.
include "arch/evbarm/conf/files.netwalker"
options NETWALKER
-options EXEC_ELF32
-options EXEC_SCRIPT
options KERNEL_BASE_EXT=0xc0000000
makeoptions CPUFLAGS="-mcpu=cortex-a8 -mfpu=neon"
# To support easy transit to ../arch/arm/arm32
-options ARM32
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=800000000
Index: src/sys/arch/evbarm/conf/std.npwr_fc
diff -u src/sys/arch/evbarm/conf/std.npwr_fc:1.5 src/sys/arch/evbarm/conf/std.npwr_fc:1.6
--- src/sys/arch/evbarm/conf/std.npwr_fc:1.5 Sun Dec 16 20:38:15 2012
+++ src/sys/arch/evbarm/conf/std.npwr_fc Sun Dec 16 23:47:56 2012
@@ -1,19 +1,14 @@
-# $NetBSD: std.npwr_fc,v 1.5 2012/12/16 20:38:15 matt Exp $
+# $NetBSD: std.npwr_fc,v 1.6 2012/12/16 23:47:56 matt Exp $
#
# standard NetBSD/evbarm for IQ80321 options
machine evbarm arm
-include "conf/std" # MI standard options
+include "arch/evbarm/conf/std.evbarm"
# Pull in IQ80321 config definitions.
-include "arch/evbarm/conf/files.npwr_fc"
+include "arch/evbarm/conf/files.npwr_fc"
-options EXEC_ELF32
options EXEC_AOUT
-options EXEC_SCRIPT
-
-# To support easy transit to ../arch/arm/arm32
-options ARM32
#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time
