From owner-svn-src-head@FreeBSD.ORG Thu Jan 5 07:19:06 2012 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 6873C106566B; Thu, 5 Jan 2012 07:19:06 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 52BD38FC0A; Thu, 5 Jan 2012 07:19:06 +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 q057J6Cj019745; Thu, 5 Jan 2012 07:19:06 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q057J5d2019743; Thu, 5 Jan 2012 07:19:05 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201201050719.q057J5d2019743@svn.freebsd.org> From: Adrian Chadd Date: Thu, 5 Jan 2012 07:19:05 +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: r229561 - head/sys/mips/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: Thu, 05 Jan 2012 07:19:06 -0000 Author: adrian Date: Thu Jan 5 07:19:05 2012 New Revision: 229561 URL: http://svn.freebsd.org/changeset/base/229561 Log: This isn't required any longer - it turns out the flash has ~ 1.7MB of space for a kernel. There's thus plenty of space for a full, non-module kernel. Modified: head/sys/mips/conf/PB47 Modified: head/sys/mips/conf/PB47 ============================================================================== --- head/sys/mips/conf/PB47 Thu Jan 5 06:22:09 2012 (r229560) +++ head/sys/mips/conf/PB47 Thu Jan 5 07:19:05 2012 (r229561) @@ -24,21 +24,12 @@ options AR71XX_ENV_UBOOT # XXX TODO: add uboot boot parameter parsing to extract MAC, RAM. # Right now it will just detect 32mb out of 64mb, as well as # return a garbage MAC address. - -# don't compile these in - the default flash area for kernel space -# is only 1.2 megabytes. To keep the flash allocation in line with -# what the documentation says for this board, we'll just have to keep -# the kernel smaller than that. -nodevice wlan, wlan_wep, wlan_ccmp, wlan_tkip, wlan_xauth -nodevice ath, ath_pci, ath_hal, ath_rate_sample - -# Since the module build doesn't like TDMA.. -nooptions IEEE80211_SUPPORT_TDMA +options AR71XX_REALMEM=64*1024*1024 # For DOS - enable if required -#options GEOM_PART_BSD -#options GEOM_PART_MBR -#options MSDOSFS +options GEOM_PART_BSD +options GEOM_PART_MBR +options MSDOSFS # uncompress - to boot read-only lzma natively from flash device geom_uncompress