From owner-p4-projects@FreeBSD.ORG  Mon Feb 18 22:45:18 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 99EA6268; Mon, 18 Feb 2013 22:45:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 57258266
 for <perforce@freebsd.org>; Mon, 18 Feb 2013 22:45:18 +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 2CE3CB41
 for <perforce@freebsd.org>; Mon, 18 Feb 2013 22:45:18 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1IMjHpI000792
 for <perforce@freebsd.org>; Mon, 18 Feb 2013 22:45:17 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 r1IMjHMY000789
 for perforce@freebsd.org; Mon, 18 Feb 2013 22:45:17 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Feb 2013 22:45:17 GMT
Message-Id: <201302182245.r1IMjHMY000789@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 222172 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: Mon, 18 Feb 2013 22:45:18 -0000

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

Change 222172 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/02/18 22:45:12

	Don't assume that the Intel StrataFlash has an MBR-based partition
	table on it -- for now, we'll just drop the UFS file system directly
	into our bootfs region.

Affected files ...

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

Differences ...

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

@@ -215,7 +215,7 @@
 		if (!autoboot ||
 		    (OPT_CHECK(RBX_NOINTR) == 0 && (c = getc(2)) != 0))
 			getstr(c);
-		putchar('\n');
+		printf("\n");
 		autoboot = 0;
 		c = 0;
 		if (parse())
@@ -314,6 +314,7 @@
 static int
 dskread(void *buf, unsigned lba, unsigned nblk)
 {
+#if 0
 	struct dos_partition *dp;
 	struct disklabel *d;
 	char *sec;
@@ -354,6 +355,7 @@
 		dsk_start -= d->d_partitions[RAW_PART].p_offset;
 		dsk_meta++;
 	}
+#endif
 	return drvread(buf, dsk_start + lba, nblk);
 }