svn commit: r239362 - in head/sys/arm: at91 conf econa lpc mv
s3c2xx0 sa11x0 ti xscale xscale/i80321 xscale/i8134x
xscale/ixp425 xscale/pxa
Andrew Turner
andrew at FreeBSD.org
Sat Aug 18 05:48:20 UTC 2012
Author: andrew
Date: Sat Aug 18 05:48:19 2012
New Revision: 239362
URL: http://svn.freebsd.org/changeset/base/239362
Log:
Set machine correctly on ARM. This allows universe to use the correct world
when building each kernel.
Reviewed by: imp
Added:
head/sys/arm/xscale/std.xscale-be (contents, props changed)
Modified:
head/sys/arm/at91/std.at91
head/sys/arm/at91/std.at91sam9
head/sys/arm/at91/std.at91sam9g45
head/sys/arm/at91/std.atmel
head/sys/arm/conf/DEFAULTS
head/sys/arm/econa/std.econa
head/sys/arm/lpc/std.lpc
head/sys/arm/mv/std-pj4b.mv
head/sys/arm/mv/std.mv
head/sys/arm/s3c2xx0/std.s3c2410
head/sys/arm/sa11x0/std.sa11x0
head/sys/arm/ti/std.ti
head/sys/arm/xscale/i80321/std.i80219
head/sys/arm/xscale/i80321/std.i80321
head/sys/arm/xscale/i8134x/std.i81342
head/sys/arm/xscale/ixp425/std.ixp425
head/sys/arm/xscale/ixp425/std.ixp435
head/sys/arm/xscale/pxa/std.pxa
head/sys/arm/xscale/std.xscale
Modified: head/sys/arm/at91/std.at91
==============================================================================
--- head/sys/arm/at91/std.at91 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/at91/std.at91 Sat Aug 18 05:48:19 2012 (r239362)
@@ -2,6 +2,7 @@
files "../at91/files.at91"
cpu CPU_ARM9
+machine arm
makeoptions CONF_CFLAGS=-mcpu=arm9
options PHYSADDR=0x20000000
options NO_EVENTTIMERS
Modified: head/sys/arm/at91/std.at91sam9
==============================================================================
--- head/sys/arm/at91/std.at91sam9 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/at91/std.at91sam9 Sat Aug 18 05:48:19 2012 (r239362)
@@ -2,6 +2,7 @@
files "../at91/files.at91"
cpu CPU_ARM9
+machine arm
makeoptions CONF_CFLAGS=-mcpu=arm9
options PHYSADDR=0x20000000
options NO_EVENTTIMERS
Modified: head/sys/arm/at91/std.at91sam9g45
==============================================================================
--- head/sys/arm/at91/std.at91sam9g45 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/at91/std.at91sam9g45 Sat Aug 18 05:48:19 2012 (r239362)
@@ -7,6 +7,7 @@
files "../at91/files.at91"
cpu CPU_ARM9
+machine arm
makeoptions CONF_CFLAGS=-mcpu=arm9
options PHYSADDR=0x70000000
options NO_EVENTTIMERS
Modified: head/sys/arm/at91/std.atmel
==============================================================================
--- head/sys/arm/at91/std.atmel Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/at91/std.atmel Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/conf/DEFAULTS
==============================================================================
--- head/sys/arm/conf/DEFAULTS Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/conf/DEFAULTS Sat Aug 18 05:48:19 2012 (r239362)
@@ -3,8 +3,6 @@
#
# $FreeBSD$
-machine arm
-
device mem
options GEOM_PART_BSD
Modified: head/sys/arm/econa/std.econa
==============================================================================
--- head/sys/arm/econa/std.econa Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/econa/std.econa Sat Aug 18 05:48:19 2012 (r239362)
@@ -2,6 +2,7 @@
files "../econa/files.econa"
cpu CPU_FA526
+machine arm
makeoptions CONF_CFLAGS=-march=armv4
options PHYSADDR=0x00000000
makeoptions KERNPHYSADDR=0x01000000
Modified: head/sys/arm/lpc/std.lpc
==============================================================================
--- head/sys/arm/lpc/std.lpc Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/lpc/std.lpc Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/mv/std-pj4b.mv
==============================================================================
--- head/sys/arm/mv/std-pj4b.mv Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/mv/std-pj4b.mv Sat Aug 18 05:48:19 2012 (r239362)
@@ -2,5 +2,6 @@
files "../mv/files.mv"
cpu CPU_MV_PJ4B
+machine arm armv6
options VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
Modified: head/sys/arm/mv/std.mv
==============================================================================
--- head/sys/arm/mv/std.mv Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/mv/std.mv Sat Aug 18 05:48:19 2012 (r239362)
@@ -2,5 +2,6 @@
files "../mv/files.mv"
cpu CPU_ARM9E
+machine arm
makeoptions CONF_CFLAGS="-march=armv5te"
options FREEBSD_BOOT_LOADER
Modified: head/sys/arm/s3c2xx0/std.s3c2410
==============================================================================
--- head/sys/arm/s3c2xx0/std.s3c2410 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/s3c2xx0/std.s3c2410 Sat Aug 18 05:48:19 2012 (r239362)
@@ -2,6 +2,7 @@
files "../s3c2xx0/files.s3c2xx0"
cpu CPU_ARM9
+machine arm
makeoptions CONF_CFLAGS=-mcpu=arm920t
options NO_EVENTTIMERS
Modified: head/sys/arm/sa11x0/std.sa11x0
==============================================================================
--- head/sys/arm/sa11x0/std.sa11x0 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/sa11x0/std.sa11x0 Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/ti/std.ti
==============================================================================
--- head/sys/arm/ti/std.ti Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/ti/std.ti Sat Aug 18 05:48:19 2012 (r239362)
@@ -1,5 +1,6 @@
# $FreeBSD$
cpu CPU_CORTEXA
+machine arm armv6
files "../ti/files.ti"
Modified: head/sys/arm/xscale/i80321/std.i80219
==============================================================================
--- head/sys/arm/xscale/i80321/std.i80219 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/i80321/std.i80219 Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/xscale/i80321/std.i80321
==============================================================================
--- head/sys/arm/xscale/i80321/std.i80321 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/i80321/std.i80321 Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/xscale/i8134x/std.i81342
==============================================================================
--- head/sys/arm/xscale/i8134x/std.i81342 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/i8134x/std.i81342 Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/xscale/ixp425/std.ixp425
==============================================================================
--- head/sys/arm/xscale/ixp425/std.ixp425 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/ixp425/std.ixp425 Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/xscale/ixp425/std.ixp435
==============================================================================
--- head/sys/arm/xscale/ixp425/std.ixp435 Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/ixp425/std.ixp435 Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/xscale/pxa/std.pxa
==============================================================================
--- head/sys/arm/xscale/pxa/std.pxa Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/pxa/std.pxa Sat Aug 18 05:48:19 2012 (r239362)
@@ -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
Modified: head/sys/arm/xscale/std.xscale
==============================================================================
--- head/sys/arm/xscale/std.xscale Fri Aug 17 20:15:01 2012 (r239361)
+++ head/sys/arm/xscale/std.xscale Sat Aug 18 05:48:19 2012 (r239362)
@@ -1,4 +1,3 @@
# $FreeBSD$
-# machine arm armeb
options ARM_CACHE_LOCK_ENABLE
options NO_EVENTTIMERS
Added: head/sys/arm/xscale/std.xscale-be
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/xscale/std.xscale-be Sat Aug 18 05:48:19 2012 (r239362)
@@ -0,0 +1,5 @@
+#Big-Endian XScale generic configuration
+#$FreeBSD$
+
+include "../xscale/std.xscale"
+machine arm armeb
More information about the svn-src-all
mailing list