From owner-p4-projects@FreeBSD.ORG  Tue Mar 26 16:24:49 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 8870AB22; Tue, 26 Mar 2013 16:24:49 +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 446F7B20
 for <perforce@freebsd.org>; Tue, 26 Mar 2013 16:24:49 +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 33EAF993
 for <perforce@freebsd.org>; Tue, 26 Mar 2013 16:24:49 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QGOm7Q072860
 for <perforce@freebsd.org>; Tue, 26 Mar 2013 16:24:48 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 r2QGOm6c072857
 for perforce@freebsd.org; Tue, 26 Mar 2013 16:24:48 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 26 Mar 2013 16:24:48 GMT
Message-Id: <201303261624.r2QGOm6c072857@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 227087 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: Tue, 26 Mar 2013 16:24:49 -0000

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

Change 227087 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/03/26 16:24:29

	FreeBSD/mips rather than FreeBSD/x86 boot2.
	
	For now, don't do partition tables -- we just stick a UFS file
	system straight in flash or on the SD card.  We may want them
	back in the future, however.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#5 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#5 (text+ko) ====

@@ -300,7 +300,7 @@
 
     for (;;) {
 	if (!autoboot || !OPT_CHECK(RBX_QUIET))
-	    printf("\nFreeBSD/x86 boot\n"
+	    printf("\nFreeBSD/mips boot\n"
 		   "Default: %u:%s(%u,%c)%s\n"
 		   "boot: ",
 		   dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
@@ -516,6 +516,11 @@
 static int
 dskread(void *buf, unsigned lba, unsigned nblk)
 {
+#if 0
+    /*
+     * XXXRW: For now, assume no partition table around the file system; it's
+     * just in raw flash.
+     */
     struct dos_partition *dp;
     struct disklabel *d;
     char *sec;
@@ -575,6 +580,9 @@
 	}
     }
     return drvread(buf, dsk.start + lba, nblk);
+#else
+    return drvread(buf, lba, nblk);
+#endif
 }
 
 static void