Author: imp
Date: Sun Jul  1 06:34:17 2012
New Revision: 237881
URL: http://svn.freebsd.org/changeset/base/237881

Log:
  Opt-in rather than opt-out of the SoC.  We don't really support
  running with multiple SoCs compiled in very well anyway, so this just
  wastes space.  As more and more SoCs arrive in the tree, it is better
  to edit one master file that builds them all than many board files.

Modified:
  head/sys/arm/at91/std.at91
  head/sys/arm/at91/std.at91sam9
  head/sys/arm/at91/std.ethernut5
  head/sys/arm/at91/std.hl201
  head/sys/arm/at91/std.qila9g20
  head/sys/arm/at91/std.sam9g20ek
  head/sys/arm/at91/std.sam9x25ek

Modified: head/sys/arm/at91/std.at91
==============================================================================
--- head/sys/arm/at91/std.at91  Sun Jul  1 05:40:33 2012        (r237880)
+++ head/sys/arm/at91/std.at91  Sun Jul  1 06:34:17 2012        (r237881)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-files  "../at91/files.at91"
+files          "../at91/files.at91"
 cpu            CPU_ARM9
 makeoptions    CONF_CFLAGS=-mcpu=arm9
 options        PHYSADDR=0x20000000

Modified: head/sys/arm/at91/std.at91sam9
==============================================================================
--- head/sys/arm/at91/std.at91sam9      Sun Jul  1 05:40:33 2012        
(r237880)
+++ head/sys/arm/at91/std.at91sam9      Sun Jul  1 06:34:17 2012        
(r237881)
@@ -1,13 +1,9 @@
 # $FreeBSD$
 
-files  "../at91/files.at91"
+files          "../at91/files.at91"
 cpu            CPU_ARM9
 makeoptions    CONF_CFLAGS=-mcpu=arm9
 options        PHYSADDR=0x20000000
 
 # bring in the sam specific timers and such
 device         at91sam9
-
-device         at91sam9260
-device         at91sam9g20
-device         at91sam9x25

Modified: head/sys/arm/at91/std.ethernut5
==============================================================================
--- head/sys/arm/at91/std.ethernut5     Sun Jul  1 05:40:33 2012        
(r237880)
+++ head/sys/arm/at91/std.ethernut5     Sun Jul  1 06:34:17 2012        
(r237881)
@@ -8,5 +8,4 @@ options         KERNPHYSADDR=0x20000000
 options        KERNVIRTADDR=0xc0000000
 
 device         at91_board_ethernut5
-nodevice       at91sam9g20
-nodevice       at91sam9x25
+device         at91sam9260

Modified: head/sys/arm/at91/std.hl201
==============================================================================
--- head/sys/arm/at91/std.hl201 Sun Jul  1 05:40:33 2012        (r237880)
+++ head/sys/arm/at91/std.hl201 Sun Jul  1 06:34:17 2012        (r237881)
@@ -8,3 +8,4 @@ options         KERNPHYSADDR=0x20000000 
 options                KERNVIRTADDR=0xc0000000
 
 device         at91_board_hl201
+device         at91sam9g20

Modified: head/sys/arm/at91/std.qila9g20
==============================================================================
--- head/sys/arm/at91/std.qila9g20      Sun Jul  1 05:40:33 2012        
(r237880)
+++ head/sys/arm/at91/std.qila9g20      Sun Jul  1 06:34:17 2012        
(r237881)
@@ -8,3 +8,4 @@ options         KERNPHYSADDR=0x20000000 
 options                KERNVIRTADDR=0xc0000000
 
 device         at91_board_qila9g20
+device         at91sam9g20

Modified: head/sys/arm/at91/std.sam9g20ek
==============================================================================
--- head/sys/arm/at91/std.sam9g20ek     Sun Jul  1 05:40:33 2012        
(r237880)
+++ head/sys/arm/at91/std.sam9g20ek     Sun Jul  1 06:34:17 2012        
(r237881)
@@ -8,3 +8,4 @@ options         KERNPHYSADDR=0x20000000 
 options                KERNVIRTADDR=0xc0000000
 
 device         at91_board_sam9g20ek
+device         at91sam9g20

Modified: head/sys/arm/at91/std.sam9x25ek
==============================================================================
--- head/sys/arm/at91/std.sam9x25ek     Sun Jul  1 05:40:33 2012        
(r237880)
+++ head/sys/arm/at91/std.sam9x25ek     Sun Jul  1 06:34:17 2012        
(r237881)
@@ -8,5 +8,4 @@ options         KERNPHYSADDR=0x20000000 
 options                KERNVIRTADDR=0xc0000000
 
 device         at91_board_sam9x25ek
-nodevice at91sam9g20
-nodevice at91sam9260
+device         at91sam9x25
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to