summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/armish/conf/GENERIC3
-rw-r--r--sys/arch/armish/conf/RAMDISK3
-rw-r--r--sys/arch/beagle/conf/RAMDISK3
-rw-r--r--sys/arch/gumstix/conf/GENERIC3
-rw-r--r--sys/arch/gumstix/conf/RAMDISK3
-rw-r--r--sys/arch/moko/conf/RAMDISK3
-rw-r--r--sys/arch/palm/conf/GENERIC3
-rw-r--r--sys/arch/palm/conf/RAMDISK3
-rw-r--r--sys/arch/zaurus/conf/GENERIC3
-rw-r--r--sys/arch/zaurus/conf/RAMDISK3
10 files changed, 10 insertions, 20 deletions
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 80c8b24cc50..98eff064144 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.30 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.31 2010/04/26 20:51:51 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -17,7 +17,6 @@ options ARM32
makeoptions KERNEL_BASE_PHYS="0x00200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="armish"
options CPU_XSCALE_80321 # Support the XScale core
options XSCALE_CACHE_READ_WRITE_ALLOCATE
diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK
index b8412f63c92..5b27427c438 100644
--- a/sys/arch/armish/conf/RAMDISK
+++ b/sys/arch/armish/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.13 2009/08/11 12:25:07 krw Exp $
+# $OpenBSD: RAMDISK,v 1.14 2010/04/26 20:51:51 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -17,7 +17,6 @@ options ARM32
#makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_PHYS="0x00200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="armish"
option CPU_XSCALE_80321 # Support the XScale core
option XSCALE_CACHE_READ_WRITE_ALLOCATE
diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK
index 230bdf112f9..12d202df921 100644
--- a/sys/arch/beagle/conf/RAMDISK
+++ b/sys/arch/beagle/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.5 2010/02/12 05:36:10 drahn Exp $
+# $OpenBSD: RAMDISK,v 1.6 2010/04/26 20:51:51 deraadt Exp $
#
# GENERIC machine description file
#
@@ -37,7 +37,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0x80300000"
makeoptions KERNEL_BASE_VIRT="0xc0300000"
-makeoptions BOARDTYPE="beagle"
options BUILD_STARTUP_PAGETABLE
options STARTUP_PAGETABLE_ADDR=0x80200000
options SDRAM_START="0x80000000"
diff --git a/sys/arch/gumstix/conf/GENERIC b/sys/arch/gumstix/conf/GENERIC
index 94d1e1785de..1712a415791 100644
--- a/sys/arch/gumstix/conf/GENERIC
+++ b/sys/arch/gumstix/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.5 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.6 2010/04/26 20:51:51 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -20,7 +20,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="gumstix"
# CPU options
options CPU_XSCALE_PXA2X0 # Support the XScale core
diff --git a/sys/arch/gumstix/conf/RAMDISK b/sys/arch/gumstix/conf/RAMDISK
index 24c96dec95a..7640f262632 100644
--- a/sys/arch/gumstix/conf/RAMDISK
+++ b/sys/arch/gumstix/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.1 2008/11/26 14:18:11 drahn Exp $
+# $OpenBSD: RAMDISK,v 1.2 2010/04/26 20:51:51 deraadt Exp $
machine gumstix arm
@@ -19,7 +19,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="gumstix"
# estimated number of users
diff --git a/sys/arch/moko/conf/RAMDISK b/sys/arch/moko/conf/RAMDISK
index 00ccad11361..debdb1ba4bc 100644
--- a/sys/arch/moko/conf/RAMDISK
+++ b/sys/arch/moko/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.3 2009/01/02 06:38:24 drahn Exp $
+# $OpenBSD: RAMDISK,v 1.4 2010/04/26 20:51:51 deraadt Exp $
machine moko arm
@@ -22,7 +22,6 @@ options S3C2XX0_XTAL_CLK=12000000
makeoptions KERNEL_BASE_PHYS="0x30300000"
makeoptions KERNEL_BASE_VIRT="0xc0300000"
-makeoptions BOARDTYPE="moko"
# estimated number of users
diff --git a/sys/arch/palm/conf/GENERIC b/sys/arch/palm/conf/GENERIC
index 4cde8cd5392..2dffe084c40 100644
--- a/sys/arch/palm/conf/GENERIC
+++ b/sys/arch/palm/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.4 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.5 2010/04/26 20:51:51 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -20,7 +20,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="palm"
# CPU options
options CPU_XSCALE_PXA2X0 # Support the XScale core
diff --git a/sys/arch/palm/conf/RAMDISK b/sys/arch/palm/conf/RAMDISK
index 27c71b97832..a20b47779e6 100644
--- a/sys/arch/palm/conf/RAMDISK
+++ b/sys/arch/palm/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.4 2009/10/25 04:16:33 marex Exp $
+# $OpenBSD: RAMDISK,v 1.5 2010/04/26 20:51:51 deraadt Exp $
machine palm arm
@@ -20,7 +20,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="palm"
# estimated number of users
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 763c0896328..74cbfe07d64 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.75 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.76 2010/04/26 20:51:51 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -20,7 +20,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="zaurus"
# CPU options
options CPU_XSCALE_PXA2X0 # Support the XScale core
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index 2d379390f96..a5e57439430 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.39 2009/06/02 06:33:24 todd Exp $
+# $OpenBSD: RAMDISK,v 1.40 2010/04/26 20:51:51 deraadt Exp $
machine zaurus arm
@@ -20,7 +20,6 @@ options CACHE_CLEAN_BLOCK_INTR
makeoptions KERNEL_BASE_PHYS="0xa0200000"
makeoptions KERNEL_BASE_VIRT="0xc0200000"
-makeoptions BOARDTYPE="zaurus"
# estimated number of users