PERFORCE change 227087 for review

[Robert Watson]

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

Change 227087 by rwatson at 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