From owner-svn-src-all@FreeBSD.ORG Tue Jan 7 13:09:36 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 44CCAEF2; Tue, 7 Jan 2014 13:09:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 318031618; Tue, 7 Jan 2014 13:09:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07D9aXY011580; Tue, 7 Jan 2014 13:09:36 GMT (envelope-from loos@svn.freebsd.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07D9ZOI011579; Tue, 7 Jan 2014 13:09:35 GMT (envelope-from loos@svn.freebsd.org) Message-Id: <201401071309.s07D9ZOI011579@svn.freebsd.org> From: Luiz Otavio O Souza Date: Tue, 7 Jan 2014 13:09:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260392 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 07 Jan 2014 13:09:36 -0000 Author: loos Date: Tue Jan 7 13:09:35 2014 New Revision: 260392 URL: http://svnweb.freebsd.org/changeset/base/260392 Log: Fix the geom mappings for WR1043ND. The uboot mapping is only 128KiB (0x20000) and not 2MiB (0x200000). Dynamically adjust kernel and rootfs mappings based on the geom_uncompress(4) magic. This makes the built images more reliable by accepting changes on kernel size transparently and matches the images built with zrouter and freebsd-wifi-build. Tested by: gjb Approved by: adrian (mentor) Obtained from: Zrouter Modified: head/sys/mips/conf/TP-WN1043ND.hints Modified: head/sys/mips/conf/TP-WN1043ND.hints ============================================================================== --- head/sys/mips/conf/TP-WN1043ND.hints Tue Jan 7 11:51:00 2014 (r260391) +++ head/sys/mips/conf/TP-WN1043ND.hints Tue Jan 7 13:09:35 2014 (r260392) @@ -45,18 +45,18 @@ hint.ath.0.eepromaddr=0x1fff1000 hint.map.0.at="flash/spi0" hint.map.0.start=0x00000000 -hint.map.0.end=0x000200000 +hint.map.0.end=0x00020000 hint.map.0.name="uboot" hint.map.0.readonly=1 hint.map.1.at="flash/spi0" hint.map.1.start=0x00020000 -hint.map.1.end=0x00220000 +hint.map.1.end="search:0x00100000:0x10000:.!/bin/sh" hint.map.1.name="kernel" hint.map.1.readonly=1 hint.map.2.at="flash/spi0" -hint.map.2.start=0x00220000 +hint.map.2.start="search:0x00100000:0x10000:.!/bin/sh" hint.map.2.end=0x007e0000 hint.map.2.name="rootfs" hint.map.2.readonly=1