20 files changed, 22 insertions, 13 deletions

diff --git a/sys/arm/at91/std.at91 b/sys/arm/at91/std.at91
index 3f91330c1b298..baeea47a2b076 100644
--- a/sys/arm/at91/std.at91
+++ b/sys/arm/at91/std.at91
@@ -2,6 +2,7 @@
 
 files		"../at91/files.at91"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x20000000
 options		NO_EVENTTIMERS
diff --git a/sys/arm/at91/std.at91sam9 b/sys/arm/at91/std.at91sam9
index 307da6dbe8de2..c9be56642a3c3 100644
--- a/sys/arm/at91/std.at91sam9
+++ b/sys/arm/at91/std.at91sam9
@@ -2,6 +2,7 @@
 
 files		"../at91/files.at91"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x20000000
 options		NO_EVENTTIMERS
diff --git a/sys/arm/at91/std.at91sam9g45 b/sys/arm/at91/std.at91sam9g45
index 9375363a496d2..52876bfed6604 100644
--- a/sys/arm/at91/std.at91sam9g45
+++ b/sys/arm/at91/std.at91sam9g45
@@ -7,6 +7,7 @@
 
 files		"../at91/files.at91"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x70000000
 options		NO_EVENTTIMERS
diff --git a/sys/arm/at91/std.atmel b/sys/arm/at91/std.atmel
index a56c964d248c8..108cf545acede 100644
--- a/sys/arm/at91/std.atmel
+++ b/sys/arm/at91/std.atmel
@@ -1,10 +1,6 @@
 # $FreeBSD$
 
-files		"../at91/files.at91"
-cpu		CPU_ARM9
-makeoptions	CONF_CFLAGS=-mcpu=arm9
-options 	PHYSADDR=0x20000000
-options		NO_EVENTTIMERS
+include 	"../at91/std.at91sam9"
 
 # Supported SoCs for the at91 platform
 device		at91rm9200
diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS
index 591a0a14c8dee..4571c37ac86f6 100644
--- a/sys/arm/conf/DEFAULTS
+++ b/sys/arm/conf/DEFAULTS
@@ -3,8 +3,6 @@
 #
 # $FreeBSD$
 
-machine 	arm
-
 device		mem
 
 options 	GEOM_PART_BSD
diff --git a/sys/arm/econa/std.econa b/sys/arm/econa/std.econa
index 46d819458e7e1..324caf358a6ae 100644
--- a/sys/arm/econa/std.econa
+++ b/sys/arm/econa/std.econa
@@ -2,6 +2,7 @@
 
 files	"../econa/files.econa"
 cpu		CPU_FA526
+machine 	arm
 makeoptions	CONF_CFLAGS=-march=armv4
 options	PHYSADDR=0x00000000
 makeoptions	KERNPHYSADDR=0x01000000
diff --git a/sys/arm/lpc/std.lpc b/sys/arm/lpc/std.lpc
index ee5f2f3a13d19..84995ced887ef 100644
--- a/sys/arm/lpc/std.lpc
+++ b/sys/arm/lpc/std.lpc
@@ -5,6 +5,7 @@
 
 files		"../lpc/files.lpc"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS="-march=armv5te"
 options		PHYSADDR=0x80000000
 options		STARTUP_PAGETABLE_ADDR=0x80000000
diff --git a/sys/arm/mv/std-pj4b.mv b/sys/arm/mv/std-pj4b.mv
index 031e960fc98b0..7d779c29cfce3 100644
--- a/sys/arm/mv/std-pj4b.mv
+++ b/sys/arm/mv/std-pj4b.mv
@@ -2,5 +2,6 @@
 
 files		"../mv/files.mv"
 cpu		CPU_MV_PJ4B
+machine 	arm	armv6
 
 options		VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
diff --git a/sys/arm/mv/std.mv b/sys/arm/mv/std.mv
index 6cf235c2cb07c..f6a7bc99a749b 100644
--- a/sys/arm/mv/std.mv
+++ b/sys/arm/mv/std.mv
@@ -2,5 +2,6 @@
 
 files		"../mv/files.mv"
 cpu		CPU_ARM9E
+machine 	arm
 makeoptions	CONF_CFLAGS="-march=armv5te"
 options		FREEBSD_BOOT_LOADER
diff --git a/sys/arm/s3c2xx0/std.s3c2410 b/sys/arm/s3c2xx0/std.s3c2410
index 8d30f4eef871b..266d9e77f7ec1 100644
--- a/sys/arm/s3c2xx0/std.s3c2410
+++ b/sys/arm/s3c2xx0/std.s3c2410
@@ -2,6 +2,7 @@
 
 files	"../s3c2xx0/files.s3c2xx0"
 cpu	CPU_ARM9
+machine 	arm
 
 makeoptions	CONF_CFLAGS=-mcpu=arm920t
 options		NO_EVENTTIMERS
diff --git a/sys/arm/sa11x0/std.sa11x0 b/sys/arm/sa11x0/std.sa11x0
index 9cc5289090d3e..ed438c5a9d442 100644
--- a/sys/arm/sa11x0/std.sa11x0
+++ b/sys/arm/sa11x0/std.sa11x0
@@ -3,6 +3,7 @@
 files		"../sa11x0/files.sa11x0"
 cpu		CPU_SA1100
 cpu		CPU_SA1110
+machine 	arm
 makeoptions	KERNPHYSADDR=0xc0000000
 makeoptions	KERNVIRTADDR=0xc0000000
 options		NO_EVENTTIMERS
diff --git a/sys/arm/ti/std.ti b/sys/arm/ti/std.ti
index f3bc4fbf9fc11..218d731e0b3b2 100644
--- a/sys/arm/ti/std.ti
+++ b/sys/arm/ti/std.ti
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 cpu 		CPU_CORTEXA
+machine 	arm	armv6
 
 files		"../ti/files.ti"
diff --git a/sys/arm/xscale/i80321/std.i80219 b/sys/arm/xscale/i80321/std.i80219
index 8ff075cf71b43..7cc8f377a8769 100644
--- a/sys/arm/xscale/i80321/std.i80219
+++ b/sys/arm/xscale/i80321/std.i80219
@@ -1,5 +1,5 @@
 #XScale i80219 generic configuration
 #$FreeBSD$
 files		"../xscale/i80321/files.i80219"
-include		"../xscale/std.xscale"
+include		"../xscale/std.xscale-be"
 cpu 		CPU_XSCALE_80219
diff --git a/sys/arm/xscale/i80321/std.i80321 b/sys/arm/xscale/i80321/std.i80321
index 3d8b8f9600164..8142bdf0803e0 100644
--- a/sys/arm/xscale/i80321/std.i80321
+++ b/sys/arm/xscale/i80321/std.i80321
@@ -1,5 +1,5 @@
 #XScale i80321 generic configuration
 #$FreeBSD$
 files		"../xscale/i80321/files.i80321"
-include		"../xscale/std.xscale"
+include		"../xscale/std.xscale-be"
 cpu 		CPU_XSCALE_80321
diff --git a/sys/arm/xscale/i8134x/std.i81342 b/sys/arm/xscale/i8134x/std.i81342
index e95af9d87bd05..16c72ce079e50 100644
--- a/sys/arm/xscale/i8134x/std.i81342
+++ b/sys/arm/xscale/i8134x/std.i81342
@@ -1,5 +1,5 @@
 #XScale i81342 generic configuration
 #$FreeBSD$
 files		"../xscale/i8134x/files.i81342"
-include		"../xscale/std.xscale"
+include		"../xscale/std.xscale-be"
 cpu 		CPU_XSCALE_81342
diff --git a/sys/arm/xscale/ixp425/std.ixp425 b/sys/arm/xscale/ixp425/std.ixp425
index 87d254e8c7cc3..27d807b77ca38 100644
--- a/sys/arm/xscale/ixp425/std.ixp425
+++ b/sys/arm/xscale/ixp425/std.ixp425
@@ -1,5 +1,5 @@
 #XScale IXP425 generic configuration
 #$FreeBSD$
 files		"../xscale/ixp425/files.ixp425"
-include		"../xscale/std.xscale"
+include		"../xscale/std.xscale-be"
 cpu 		CPU_XSCALE_IXP425
diff --git a/sys/arm/xscale/ixp425/std.ixp435 b/sys/arm/xscale/ixp425/std.ixp435
index a5a0ec7e73904..c80e3b42311a4 100644
--- a/sys/arm/xscale/ixp425/std.ixp435
+++ b/sys/arm/xscale/ixp425/std.ixp435
@@ -2,6 +2,6 @@
 #$FreeBSD$
 
 files		"../xscale/ixp425/files.ixp425"
-include		"../xscale/std.xscale"
+include		"../xscale/std.xscale-be"
 cpu 		CPU_XSCALE_IXP435
 cpu 		CPU_XSCALE_IXP425
diff --git a/sys/arm/xscale/pxa/std.pxa b/sys/arm/xscale/pxa/std.pxa
index 9842b8412b0d0..63ef8856ad611 100644
--- a/sys/arm/xscale/pxa/std.pxa
+++ b/sys/arm/xscale/pxa/std.pxa
@@ -7,3 +7,4 @@ makeoptions	KERNVIRTADDR=0xc0200000
 makeoptions	CONF_CFLAGS=-mcpu=xscale
 options		XSCALE_CACHE_READ_WRITE_ALLOCATE
 options		ARM_USE_SMALL_ALLOC
+machine 	arm
diff --git a/sys/arm/xscale/std.xscale b/sys/arm/xscale/std.xscale
index 06e9dc8121fed..b5266bd8d80d4 100644
--- a/sys/arm/xscale/std.xscale
+++ b/sys/arm/xscale/std.xscale
@@ -1,4 +1,3 @@
 # $FreeBSD$
-# machine arm armeb
 options		ARM_CACHE_LOCK_ENABLE
 options		NO_EVENTTIMERS
diff --git a/sys/arm/xscale/std.xscale-be b/sys/arm/xscale/std.xscale-be
new file mode 100644
index 0000000000000..6ba7a25d871dc
--- /dev/null
+++ b/sys/arm/xscale/std.xscale-be
@@ -0,0 +1,5 @@
+#Big-Endian XScale generic configuration
+#$FreeBSD$
+
+include		"../xscale/std.xscale"
+machine 	arm	armeb