Index: trunk/i386/libsaio/efi.h
===================================================================
--- trunk/i386/libsaio/efi.h	(revision 2633)
+++ trunk/i386/libsaio/efi.h	(revision 2634)
@@ -140,7 +140,7 @@
 } EFI_GUID;
 
 #define APPLE_VENDOR_GUID \
-    {0xAC39C713, 0x7E50, 0x423D, {0x88, 0x9D, 0x27,0x8F, 0xCC, 0x34, 0x22, 0xB6} }
+    {0xAC39C713, 0x7E50, 0x423D, {0x88, 0x9D, 0x27, 0x8F, 0xCC, 0x34, 0x22, 0xB6} }
 
 #define EFI_GLOBAL_VARIABLE_GUID \
     {0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} }
@@ -187,7 +187,7 @@
 #define EFI_UNSPECIFIED_TIMEZONE  0x07FF
 
 typedef enum {
-	EfiReservedMemoryType,
+	EfiReservedMemoryType,	// 0
 	EfiLoaderCode,
 	EfiLoaderData,
 	EfiBootServicesCode,
@@ -201,7 +201,7 @@
 	EfiMemoryMappedIO,
 	EfiMemoryMappedIOPortSpace,
 	EfiPalCode,
-	EfiMaxMemoryType
+	EfiMaxMemoryType	// 14
 } EFI_MEMORY_TYPE;
 
 typedef struct {
@@ -213,14 +213,12 @@
 } __attribute__((aligned(8))) EFI_TABLE_HEADER;
 
 // possible caching types for the memory range
+#define EFI_MEMORY_UC		0x0000000000000001ULL	/* uncached */
+#define EFI_MEMORY_WC		0x0000000000000002ULL	/* write-coalescing */
+#define EFI_MEMORY_WT		0x0000000000000004ULL	/* write-through */
+#define EFI_MEMORY_WB		0x0000000000000008ULL	/* write-back */
+#define EFI_MEMORY_UCE		0x0000000000000010ULL	/* uncached, exported */
 
-#define EFI_MEMORY_UC   0x0000000000000001ULL
-#define EFI_MEMORY_WC   0x0000000000000002ULL
-#define EFI_MEMORY_WT   0x0000000000000004ULL
-#define EFI_MEMORY_WB   0x0000000000000008ULL
-#define EFI_MEMORY_UCE  0x0000000000000010ULL
-
-
 // physical memory protection on range
 
 #define EFI_MEMORY_WP 0x0000000000001000ULL
Index: trunk/i386/libsaio/sys.c
===================================================================
--- trunk/i386/libsaio/sys.c	(revision 2633)
+++ trunk/i386/libsaio/sys.c	(revision 2634)
@@ -968,12 +968,9 @@
 #if DEBUG_FEATURE_LAST_BOOT
 	char dirSpec[]		= "hd(%d,%d)/";
 	char fileSpec[]		= "Volumes";
-#endif
 	char *label;
-#if DEBUG_FEATURE_LAST_BOOT
 	u_int32_t time;
 	u_int32_t lasttime	= 0;
-
 	long flags;
 #endif
 
@@ -993,8 +990,10 @@
 
 			if ( (bvr->part_no == multiboot_partition) && (bvr->biosdev == gBIOSDev) )
 			{
+#if DEBUG_FEATURE_LAST_BOOT
 				label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));
 				DBG("Multiboot partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);
+#endif
 				return bvr;
 			}
 		}
@@ -1018,8 +1017,10 @@
 			if (matchVolumeToString(bvr, val, false))
 			{
 				free(val);
+#if DEBUG_FEATURE_LAST_BOOT
 				label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));
 				DBG("User default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);
+#endif
 				return bvr;
 			}
 		}
@@ -1128,8 +1129,10 @@
 	}
 
 	bvr = bvr2 ? bvr2 : (bvr1 ? bvr1 : chain);
+#if DEBUG_FEATURE_LAST_BOOT
 	label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));
 	DBG("Default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);
+#endif
 	return bvr;
 }
 
Index: trunk/i386/libsaio/smbios.c
===================================================================
--- trunk/i386/libsaio/smbios.c	(revision 2633)
+++ trunk/i386/libsaio/smbios.c	(revision 2634)
@@ -562,7 +562,7 @@
 //=========== MacPro ===========
 #define kDefaultMacProFamily				"MacPro" // MacPro's family = "MacPro" not "Mac Pro"
 //#define KDefauktMacProBoardAssetTagNumber		"Pro-Enclosure"
-//#define kDefaultMacProBoardType			"0xB" // 11
+//#define kDefaultMacProBoardType			"0x0B" // 11
 
 #define kDefaultMacPro					"MacPro3,1"
 #define kDefaultMacProBIOSVersion			"    MP31.88Z.006C.B05.0903051113"
Index: trunk/i386/boot2/options.c
===================================================================
--- trunk/i386/boot2/options.c	(revision 2633)
+++ trunk/i386/boot2/options.c	(revision 2634)
@@ -875,7 +875,7 @@
 			printf(getVBEInfoString());
 		}
 		changeCursor(0, kMenuTopRow, kCursorTypeUnderline, 0);
-		verbose("Scanning device %x...", gBIOSDev);
+		verbose("Scanning device %x...\n", gBIOSDev);
 	}
 
 	// When booting from CD, default to hard drive boot when possible. 
@@ -1424,7 +1424,7 @@
 			gBootVolume->fs_getuuid(gBootVolume, gBootUUIDString);
 		}
 	}
-	DBG("Boot UUID [%s (%s), %s]: %s\n", gBootVolume->label, gBootVolume->altlabel, gBootVolume->type_name, gBootUUIDString);
+	DBG("Boot UUID of '%s' %s (%s): %s\n", gBootVolume->label, gBootVolume->altlabel, gBootVolume->type_name, gBootUUIDString);
 
 	if (!processBootArgument(kRootDeviceKey, cp, configKernelFlags, bootInfo->config,
                              &argP, &cntRemaining, gRootDevice, ROOT_DEVICE_SIZE))