Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbarm/conf Use a std.evarm to handle the normal EX...
details: https://anonhg.NetBSD.org/src/rev/6be0c6fff1e6
branches: trunk
changeset: 783368:6be0c6fff1e6
user: matt <matt%NetBSD.org@localhost>
date: Sun Dec 16 23:47:56 2012 +0000
description:
Use a std.evarm to handle the normal EXEC_ELF32/EXEC_SCRIPT and ARM options
as well as include conf/std and std.arm
diffstat:
sys/arch/evbarm/conf/std.adi_brh | 11 +++--------
sys/arch/evbarm/conf/std.armadillo9 | 14 +++-----------
sys/arch/evbarm/conf/std.bcm53xx | 4 ++--
sys/arch/evbarm/conf/std.beagle | 10 +++-------
sys/arch/evbarm/conf/std.cp3100 | 11 +++--------
sys/arch/evbarm/conf/std.g42xxeb | 11 +++--------
sys/arch/evbarm/conf/std.gemini | 12 ++++--------
sys/arch/evbarm/conf/std.gumstix | 10 ++--------
sys/arch/evbarm/conf/std.hdl_g | 10 ++--------
sys/arch/evbarm/conf/std.igepv2 | 11 +++--------
sys/arch/evbarm/conf/std.imx23_olinuxino | 7 ++-----
sys/arch/evbarm/conf/std.imx31 | 11 +++--------
sys/arch/evbarm/conf/std.integrator | 10 +++-------
sys/arch/evbarm/conf/std.iq31244 | 11 +++--------
sys/arch/evbarm/conf/std.iq80310 | 11 +++--------
sys/arch/evbarm/conf/std.iq80321 | 11 +++--------
sys/arch/evbarm/conf/std.ixdp425 | 9 +++------
sys/arch/evbarm/conf/std.ixm1200 | 11 +++--------
sys/arch/evbarm/conf/std.lubbock | 11 +++--------
sys/arch/evbarm/conf/std.marvell | 9 ++-------
sys/arch/evbarm/conf/std.mini2440 | 11 +++--------
sys/arch/evbarm/conf/std.mmnet | 7 ++-----
sys/arch/evbarm/conf/std.mpcsa | 7 ++-----
sys/arch/evbarm/conf/std.mv2120 | 11 +++--------
sys/arch/evbarm/conf/std.n900 | 10 +++-------
sys/arch/evbarm/conf/std.netwalker | 7 ++-----
sys/arch/evbarm/conf/std.npwr_fc | 11 +++--------
sys/arch/evbarm/conf/std.nslu2 | 10 +++-------
sys/arch/evbarm/conf/std.osk5912 | 12 +++---------
sys/arch/evbarm/conf/std.overo | 9 ++-------
sys/arch/evbarm/conf/std.rpi | 11 +++--------
sys/arch/evbarm/conf/std.smdk2410 | 11 +++--------
sys/arch/evbarm/conf/std.smdk2800 | 11 +++--------
sys/arch/evbarm/conf/std.tisdp24xx | 11 +++--------
sys/arch/evbarm/conf/std.tsarm | 12 +++---------
sys/arch/evbarm/conf/std.viper | 11 +++--------
36 files changed, 100 insertions(+), 267 deletions(-)
diffs (truncated from 907 to 300 lines):
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.adi_brh
--- a/sys/arch/evbarm/conf/std.adi_brh Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.adi_brh Sun Dec 16 23:47:56 2012 +0000
@@ -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"
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.armadillo9
--- a/sys/arch/evbarm/conf/std.armadillo9 Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.armadillo9 Sun Dec 16 23:47:56 2012 +0000
@@ -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
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.bcm53xx
--- a/sys/arch/evbarm/conf/std.bcm53xx Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.bcm53xx Sun Dec 16 23:47:56 2012 +0000
@@ -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"
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.beagle
--- a/sys/arch/evbarm/conf/std.beagle Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.beagle Sun Dec 16 23:47:56 2012 +0000
@@ -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
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.cp3100
--- a/sys/arch/evbarm/conf/std.cp3100 Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.cp3100 Sun Dec 16 23:47:56 2012 +0000
@@ -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"
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.g42xxeb
--- a/sys/arch/evbarm/conf/std.g42xxeb Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.g42xxeb Sun Dec 16 23:47:56 2012 +0000
@@ -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"
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.gemini
--- a/sys/arch/evbarm/conf/std.gemini Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.gemini Sun Dec 16 23:47:56 2012 +0000
@@ -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
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.gumstix
--- a/sys/arch/evbarm/conf/std.gumstix Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.gumstix Sun Dec 16 23:47:56 2012 +0000
@@ -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"
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.hdl_g
--- a/sys/arch/evbarm/conf/std.hdl_g Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.hdl_g Sun Dec 16 23:47:56 2012 +0000
@@ -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"
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.igepv2
--- a/sys/arch/evbarm/conf/std.igepv2 Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.igepv2 Sun Dec 16 23:47:56 2012 +0000
@@ -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
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.imx23_olinuxino
--- a/sys/arch/evbarm/conf/std.imx23_olinuxino Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.imx23_olinuxino Sun Dec 16 23:47:56 2012 +0000
@@ -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
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.imx31
--- a/sys/arch/evbarm/conf/std.imx31 Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.imx31 Sun Dec 16 23:47:56 2012 +0000
@@ -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
diff -r 78075aa33fdc -r 6be0c6fff1e6 sys/arch/evbarm/conf/std.integrator
--- a/sys/arch/evbarm/conf/std.integrator Sun Dec 16 23:37:34 2012 +0000
+++ b/sys/arch/evbarm/conf/std.integrator Sun Dec 16 23:47:56 2012 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index