PERFORCE change 222172 for review

[Robert Watson]

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

Change 222172 by rwatson at 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);
 }