From owner-svn-src-all@FreeBSD.ORG Sun Jul 1 06:34:18 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A053106566B; Sun, 1 Jul 2012 06:34:18 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E8E888FC08; Sun, 1 Jul 2012 06:34:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q616YHtf070845; Sun, 1 Jul 2012 06:34:17 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q616YHlt070837; Sun, 1 Jul 2012 06:34:17 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201207010634.q616YHlt070837@svn.freebsd.org> From: Warner Losh Date: Sun, 1 Jul 2012 06:34:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r237881 - head/sys/arm/at91 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jul 2012 06:34:18 -0000 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