From owner-svn-src-head@FreeBSD.ORG Sun Dec 28 11:04:24 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67FE91065674; Sun, 28 Dec 2008 11:04:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 55FDC8FC14; Sun, 28 Dec 2008 11:04:24 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBSB4OMD011861; Sun, 28 Dec 2008 11:04:24 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBSB4OWj011860; Sun, 28 Dec 2008 11:04:24 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200812281104.mBSB4OWj011860@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sun, 28 Dec 2008 11:04:24 +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: r186539 - head/sys/arm/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2008 11:04:24 -0000 Author: bz Date: Sun Dec 28 11:04:24 2008 New Revision: 186539 URL: http://svn.freebsd.org/changeset/base/186539 Log: Include std.ixp425 for "cpu" and comment out duplicate memory map options. Using the already included std.avila is not considered to be entirely right (and the options slightly differ) but the best match we currently have. Upcoming work should fit better. Reorder another variable to match the layout of other configs. Reviewed by: sam, warner (earlier version with options removed) Modified: head/sys/arm/conf/NSLU Modified: head/sys/arm/conf/NSLU ============================================================================== --- head/sys/arm/conf/NSLU Sun Dec 28 07:09:00 2008 (r186538) +++ head/sys/arm/conf/NSLU Sun Dec 28 11:04:24 2008 (r186539) @@ -19,14 +19,18 @@ ident NSLU -options PHYSADDR=0x10000000 -options KERNPHYSADDR=0x10200000 -options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm -options FLASHADDR=0x50000000 -options LOADERRAMADDR=0x00000000 -options STARTUP_PAGETABLE_ADDR=0x10000000 +# XXX What is defined in std.avila does not exactly match the following: +#options PHYSADDR=0x10000000 +#options KERNPHYSADDR=0x10200000 +#options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm +#options FLASHADDR=0x50000000 +#options LOADERRAMADDR=0x00000000 +#options STARTUP_PAGETABLE_ADDR=0x10000000 +include "../xscale/ixp425/std.ixp425" +# NB: memory mapping is defined in std.avila (see also comment above) include "../xscale/ixp425/std.avila" +options XSCALE_CACHE_READ_WRITE_ALLOCATE #To statically compile in device wiring instead of /boot/device.hints hints "NSLU.hints" #Default places to look for devices. makeoptions MODULES_OVERRIDE="" @@ -99,7 +103,6 @@ device bpf device pty device loop -options XSCALE_CACHE_READ_WRITE_ALLOCATE device md device random # Entropy device