From owner-p4-projects@FreeBSD.ORG  Sun Mar  3 22:48:38 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 28CB44F7; Sun,  3 Mar 2013 22:48:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6DC924F5
 for <perforce@freebsd.org>; Sun,  3 Mar 2013 22:48:37 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 44D31D4E
 for <perforce@freebsd.org>; Sun,  3 Mar 2013 22:48:37 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r23Mma04035431
 for <perforce@freebsd.org>; Sun, 3 Mar 2013 22:48:36 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r23MmaVs035428
 for perforce@freebsd.org; Sun, 3 Mar 2013 22:48:36 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 3 Mar 2013 22:48:36 GMT
Message-Id: <201303032248.r23MmaVs035428@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 222575 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Mar 2013 22:48:38 -0000

http://p4web.freebsd.org/@@222575?ac=10

Change 222575 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/03/03 22:48:27

	Update BERI DE4 device.hints to include geom map entries for boot
	loader space reservations in flash; this appears as /dev/map/boot.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#22 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#22 (text+ko) ====

@@ -22,45 +22,57 @@
 # Currently unused space on the first chip
 hint.map.3.at="cfid0"
 hint.map.3.start=0x01840000
-hint.map.3.end=0x02000000
+hint.map.3.end=0x01f00000
 hint.map.3.name="reserved"
 
+# Area for use by the boot loader
+hint.map.4.at="cfid0"
+hint.map.4.start=0x01f00000
+hint.map.4.end=0x02000000
+hint.map.4.name="boot"
+
 # Kernel on the second chip
-hint.map.4.at="cfid0"
-hint.map.4.start=0x02000000
-hint.map.4.end=0x04000000
-hint.map.4.name="kernel"
+hint.map.5.at="cfid0"
+hint.map.5.start=0x02000000
+hint.map.5.end=0x04000000
+hint.map.5.name="kernel"
 
 # Reserved configuration blocks.  Don't touch.
-hint.map.5.at="isf0"
-hint.map.5.start=0x00000000
-hint.map.5.end=0x00020000
-hint.map.5.name="config"
-hint.map.5.readonly=1
+hint.map.6.at="isf0"
+hint.map.6.start=0x00000000
+hint.map.6.end=0x00020000
+hint.map.6.name="config"
+hint.map.6.readonly=1
 
 # Hardwired location of bitfile
-hint.map.6.at="isf0"
-hint.map.6.start=0x00020000
-hint.map.6.end=0x01820000
-hint.map.6.name="fpga"
+hint.map.7.at="isf0"
+hint.map.7.start=0x00020000
+hint.map.7.end=0x01820000
+hint.map.7.name="fpga"
 
 # Saved OS configuration
-hint.map.7.at="isf0"
-hint.map.7.start=0x01820000
-hint.map.7.end=0x01840000
-hint.map.7.name="osconfig"
+hint.map.8.at="isf0"
+hint.map.8.start=0x01820000
+hint.map.8.end=0x01840000
+hint.map.8.name="osconfig"
 
 # Currently unused space on the first chip
-hint.map.8.at="isf0"
-hint.map.8.start=0x01840000
-hint.map.8.end=0x02000000
-hint.map.8.name="reserved"
+hint.map.9.at="isf0"
+hint.map.9.start=0x01840000
+hint.map.9.end=0x01f00000
+hint.map.9.name="reserved"
+
+# Area for use by the boot loader
+hint.map.10.at="isf0"
+hint.map.10.start=0x01f00000
+hint.map.10.end=0x02000000
+hint.map.10.name="boot"
 
 # Kernel on the second chip
-hint.map.9.at="isf1"
-hint.map.9.start=0x00000000
-hint.map.9.end=0x02000000
-hint.map.9.name="kernel"
+hint.map.11.at="isf1"
+hint.map.11.start=0x00000000
+hint.map.11.end=0x02000000
+hint.map.11.name="kernel"
 
 # Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations
 # configured from fdt(4) but PHYs are still described in here.