From owner-svn-src-stable@FreeBSD.ORG Mon Jan 5 19:54:41 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EA101F3; Mon, 5 Jan 2015 19:54:41 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A15A315B; Mon, 5 Jan 2015 19:54:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05Jsfxw009121; Mon, 5 Jan 2015 19:54:41 GMT (envelope-from hiren@FreeBSD.org) Received: (from hiren@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05JsfeL009120; Mon, 5 Jan 2015 19:54:41 GMT (envelope-from hiren@FreeBSD.org) Message-Id: <201501051954.t05JsfeL009120@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hiren set sender to hiren@FreeBSD.org using -f From: Hiren Panchasara Date: Mon, 5 Jan 2015 19:54:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r276716 - stable/10/sys/mips/conf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jan 2015 19:54:41 -0000 Author: hiren Date: Mon Jan 5 19:54:40 2015 New Revision: 276716 URL: https://svnweb.freebsd.org/changeset/base/276716 Log: MFC r273876 Use search method instead of fixed offsets for finding rootfs. This unbreaks recent images for picostation by allowing to find rootfs at correct location. Modified: stable/10/sys/mips/conf/PICOSTATION_M2HP.hints Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/mips/conf/PICOSTATION_M2HP.hints ============================================================================== --- stable/10/sys/mips/conf/PICOSTATION_M2HP.hints Mon Jan 5 19:49:20 2015 (r276715) +++ stable/10/sys/mips/conf/PICOSTATION_M2HP.hints Mon Jan 5 19:54:40 2015 (r276716) @@ -80,13 +80,13 @@ hint.map.1.readonly=1 hint.map.2.at="flash/spi0" hint.map.2.start=0x00050000 -hint.map.2.end=0x00130000 # 896k kernel +hint.map.2.end="search:0x00100000:0x10000:.!/bin/sh" hint.map.2.name="kernel" hint.map.2.readonly=1 hint.map.3.at="flash/spi0" -hint.map.3.start=0x130000 -hint.map.3.end=0x007b0000 # 6656k rootfs +hint.map.3.start="search:0x00100000:0x10000:.!/bin/sh" +hint.map.3.end=0x007b0000 hint.map.3.name="rootfs" hint.map.3.readonly=0