Index: head/sys/arm/at91/std.at91
===================================================================
--- head/sys/arm/at91/std.at91	(revision 239361)
+++ head/sys/arm/at91/std.at91	(revision 239362)
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 files		"../at91/files.at91"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x20000000
 options		NO_EVENTTIMERS
 
 # For now, just do the AT91RM9200
 device		at91rm9200
Index: head/sys/arm/at91/std.at91sam9
===================================================================
--- head/sys/arm/at91/std.at91sam9	(revision 239361)
+++ head/sys/arm/at91/std.at91sam9	(revision 239362)
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
 files		"../at91/files.at91"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x20000000
 options		NO_EVENTTIMERS
 
 # bring in the sam specific timers and such
 device		at91sam9
Index: head/sys/arm/at91/std.at91sam9g45
===================================================================
--- head/sys/arm/at91/std.at91sam9g45	(revision 239361)
+++ head/sys/arm/at91/std.at91sam9g45	(revision 239362)
@@ -1,15 +1,16 @@
 # $FreeBSD$
 #
 # Unlike other Atmel SoCs, which have their SDRAM at CS1, the
 # at91sam9g45 family has it on CS6, so PHYSADDR must be adjusted
 # accordingly.  The at91sam9g45, at91sam9g46, at91sam9m10 and at91sam9m11
 # SoCs are members of this family.
 
 files		"../at91/files.at91"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x70000000
 options		NO_EVENTTIMERS
 
 # bring in the sam specific timers and such
 device		at91sam9
Index: head/sys/arm/at91/std.atmel
===================================================================
--- head/sys/arm/at91/std.atmel	(revision 239361)
+++ head/sys/arm/at91/std.atmel	(revision 239362)
@@ -1,17 +1,13 @@
 # $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
 device		at91sam9260
 device		at91sam9g20
 device		at91sam9g45
 device		at91sam9x5
 
 # bring in the sam specific timers and such
 device		at91sam9
Index: head/sys/arm/conf/DEFAULTS
===================================================================
--- head/sys/arm/conf/DEFAULTS	(revision 239361)
+++ head/sys/arm/conf/DEFAULTS	(revision 239362)
@@ -1,11 +1,9 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/arm
 #
 # $FreeBSD$
 
-machine 	arm
-
 device		mem
 
 options 	GEOM_PART_BSD
 options 	GEOM_PART_MBR
Index: head/sys/arm/econa/std.econa
===================================================================
--- head/sys/arm/econa/std.econa	(revision 239361)
+++ head/sys/arm/econa/std.econa	(revision 239362)
@@ -1,16 +1,17 @@
 # $FreeBSD$
 
 files	"../econa/files.econa"
 cpu		CPU_FA526
+machine 	arm
 makeoptions	CONF_CFLAGS=-march=armv4
 options	PHYSADDR=0x00000000
 makeoptions	KERNPHYSADDR=0x01000000
 makeoptions	KERNVIRTADDR=0xc1000000
 
 options	KERNPHYSADDR=0x01000000
 options	KERNVIRTADDR=0xc1000000	# Used in ldscript.arm
 options	FLASHADDR=0xD0000000
 options	LOADERRAMADDR=0x00000000
 options	STARTUP_PAGETABLE_ADDR=0x00100000
 
 options	NO_EVENTTIMERS
Index: head/sys/arm/lpc/std.lpc
===================================================================
--- head/sys/arm/lpc/std.lpc	(revision 239361)
+++ head/sys/arm/lpc/std.lpc	(revision 239362)
@@ -1,14 +1,15 @@
 # $FreeBSD$
 #
 # DM644x
 #
 
 files		"../lpc/files.lpc"
 cpu		CPU_ARM9
+machine 	arm
 makeoptions	CONF_CFLAGS="-march=armv5te"
 options		PHYSADDR=0x80000000
 options		STARTUP_PAGETABLE_ADDR=0x80000000
 makeoptions	KERNPHYSADDR=0x80100000
 options		KERNPHYSADDR=0x80100000
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
Index: head/sys/arm/mv/std-pj4b.mv
===================================================================
--- head/sys/arm/mv/std-pj4b.mv	(revision 239361)
+++ head/sys/arm/mv/std-pj4b.mv	(revision 239362)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 files		"../mv/files.mv"
 cpu		CPU_MV_PJ4B
+machine 	arm	armv6
 
 options		VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
Index: head/sys/arm/mv/std.mv
===================================================================
--- head/sys/arm/mv/std.mv	(revision 239361)
+++ head/sys/arm/mv/std.mv	(revision 239362)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 files		"../mv/files.mv"
 cpu		CPU_ARM9E
+machine 	arm
 makeoptions	CONF_CFLAGS="-march=armv5te"
 options		FREEBSD_BOOT_LOADER
Index: head/sys/arm/s3c2xx0/std.s3c2410
===================================================================
--- head/sys/arm/s3c2xx0/std.s3c2410	(revision 239361)
+++ head/sys/arm/s3c2xx0/std.s3c2410	(revision 239362)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 files	"../s3c2xx0/files.s3c2xx0"
 cpu	CPU_ARM9
+machine 	arm
 
 makeoptions	CONF_CFLAGS=-mcpu=arm920t
 options		NO_EVENTTIMERS
Index: head/sys/arm/sa11x0/std.sa11x0
===================================================================
--- head/sys/arm/sa11x0/std.sa11x0	(revision 239361)
+++ head/sys/arm/sa11x0/std.sa11x0	(revision 239362)
@@ -1,8 +1,9 @@
 #StrongARM SA11x0 common options
 #$FreeBSD$
 files		"../sa11x0/files.sa11x0"
 cpu		CPU_SA1100
 cpu		CPU_SA1110
+machine 	arm
 makeoptions	KERNPHYSADDR=0xc0000000
 makeoptions	KERNVIRTADDR=0xc0000000
 options		NO_EVENTTIMERS
Index: head/sys/arm/ti/std.ti
===================================================================
--- head/sys/arm/ti/std.ti	(revision 239361)
+++ head/sys/arm/ti/std.ti	(revision 239362)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 cpu 		CPU_CORTEXA
+machine 	arm	armv6
 
 files		"../ti/files.ti"
Index: head/sys/arm/xscale/i80321/std.i80219
===================================================================
--- head/sys/arm/xscale/i80321/std.i80219	(revision 239361)
+++ head/sys/arm/xscale/i80321/std.i80219	(revision 239362)
@@ -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
Index: head/sys/arm/xscale/i80321/std.i80321
===================================================================
--- head/sys/arm/xscale/i80321/std.i80321	(revision 239361)
+++ head/sys/arm/xscale/i80321/std.i80321	(revision 239362)
@@ -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
Index: head/sys/arm/xscale/i8134x/std.i81342
===================================================================
--- head/sys/arm/xscale/i8134x/std.i81342	(revision 239361)
+++ head/sys/arm/xscale/i8134x/std.i81342	(revision 239362)
@@ -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
Index: head/sys/arm/xscale/ixp425/std.ixp425
===================================================================
--- head/sys/arm/xscale/ixp425/std.ixp425	(revision 239361)
+++ head/sys/arm/xscale/ixp425/std.ixp425	(revision 239362)
@@ -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
Index: head/sys/arm/xscale/ixp425/std.ixp435
===================================================================
--- head/sys/arm/xscale/ixp425/std.ixp435	(revision 239361)
+++ head/sys/arm/xscale/ixp425/std.ixp435	(revision 239362)
@@ -1,7 +1,7 @@
 #XScale IXP435 generic configuration
 #$FreeBSD$
 
 files		"../xscale/ixp425/files.ixp425"
-include		"../xscale/std.xscale"
+include		"../xscale/std.xscale-be"
 cpu 		CPU_XSCALE_IXP435
 cpu 		CPU_XSCALE_IXP425
Index: head/sys/arm/xscale/pxa/std.pxa
===================================================================
--- head/sys/arm/xscale/pxa/std.pxa	(revision 239361)
+++ head/sys/arm/xscale/pxa/std.pxa	(revision 239362)
@@ -1,9 +1,10 @@
 # XScale PXA generic configuration
 # $FreeBSD$
 files		"../xscale/pxa/files.pxa"
 include		"../xscale/std.xscale"
 makeoptions	KERNPHYSADDR=0xa0200000
 makeoptions	KERNVIRTADDR=0xc0200000
 makeoptions	CONF_CFLAGS=-mcpu=xscale
 options		XSCALE_CACHE_READ_WRITE_ALLOCATE
 options		ARM_USE_SMALL_ALLOC
+machine 	arm
Index: head/sys/arm/xscale/std.xscale
===================================================================
--- head/sys/arm/xscale/std.xscale	(revision 239361)
+++ head/sys/arm/xscale/std.xscale	(revision 239362)
@@ -1,4 +1,3 @@
 # $FreeBSD$
-# machine arm armeb
 options		ARM_CACHE_LOCK_ENABLE
 options		NO_EVENTTIMERS
Index: head/sys/arm/xscale/std.xscale-be
===================================================================
--- head/sys/arm/xscale/std.xscale-be	(nonexistent)
+++ head/sys/arm/xscale/std.xscale-be	(revision 239362)
@@ -0,0 +1,5 @@
+#Big-Endian XScale generic configuration
+#$FreeBSD$
+
+include		"../xscale/std.xscale"
+machine 	arm	armeb

Property changes on: head/sys/arm/xscale/std.xscale-be
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property