Index: branches/ErmaC/Enoch/i386/libsaio/bootstruct.c
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/bootstruct.c	(revision 2787)
+++ branches/ErmaC/Enoch/i386/libsaio/bootstruct.c	(revision 2788)
@@ -150,8 +150,8 @@
 	void *addr;
 	int i;
 
-	EfiMemoryRange *memoryMap	= NULL;
-	MemoryRange *range		= NULL;
+	EfiMemoryRange	*memoryMap	= NULL;
+	MemoryRange	*range		= NULL;
 	int memoryMapCount = bootInfo->memoryMapCount;
 
 	if (memoryMapCount == 0)
Index: branches/ErmaC/Enoch/i386/libsaio/efi.h
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/efi.h	(revision 2787)
+++ branches/ErmaC/Enoch/i386/libsaio/efi.h	(revision 2788)
@@ -159,6 +159,14 @@
 // ACPI 3.0 Table GUID in EFI System Table
 #define EFI_ACPI_30_TABLE_GUID EFI_ACPI_20_TABLE_GUID
 
+// The EFI variable GUID for the 'FirmwareFeatures' and friends. Also known as AppleFirmwareVariableGuid in other sources.
+#define APPLE_FIRMWARE_VARIABLE_GUID \
+    {0x4D1EDE05, 0x38C7, 0x4A6A, {0x9C, 0xC6, 0x4B, 0xCC, 0xA8, 0xB3, 0x8C, 0x14 } }
+
+// The EFI variable GUID for the 'boot-args' variable and others. Also known as AppleNVRAMVariableGuid in other sources.
+#define APPLE_NVRAM_VARIABLE_GUID \
+    {0x7C436110, 0xAB2A, 0x4BBB, {0xA8, 0x80, 0xFE, 0x41, 0x99, 0x5C, 0x9F, 0x82 } }
+
 typedef union {
   EFI_GUID  Guid;
   EFI_UINT8 Raw[16];
Index: branches/ErmaC/Enoch/i386/libsaio/bootstruct.h
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/bootstruct.h	(revision 2787)
+++ branches/ErmaC/Enoch/i386/libsaio/bootstruct.h	(revision 2788)
@@ -135,6 +135,7 @@
 	config_file_t    smbiosConfig;		// smbios.plist
 	config_file_t    helperConfig;		// boot helper partition's boot.plist
 	config_file_t    ramdiskConfig;		// RAMDisk.plist
+	config_file_t    kernelConfig;		// kernel.plist
 
 	bool             memDetect;
 } PrivateBootInfo_t;
Index: branches/ErmaC/Enoch/i386/libsaio/platform.h
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/platform.h	(revision 2787)
+++ branches/ErmaC/Enoch/i386/libsaio/platform.h	(revision 2788)
@@ -65,16 +65,19 @@
 //#define CPUID_MODEL_HASWELL_H		0x??			// Haswell H
 #define CPUID_MODEL_HASWELL_ULT		0x45			// Haswell ULT, 4th gen Core, Xeon E3-12xx v3 C8/C9/C10
 #define CPUID_MODEL_HASWELL_ULX		0x46			// Crystal Well, 4th gen Core, Xeon E3-12xx v3
-#define CPUID_MODEL_BROADWELL_HQ	0x47            // Broadwell BDW
+#define CPUID_MODEL_BROADWELL_HQ	0x47			// Broadwell BDW
 #define CPUID_MODEL_MERRIFIELD		0x4A			// Future Atom E3000, Z3000 silvermont / atom (Marrifield)
-#define CPUID_MODEL_BRASWELL    0x4C            // Atom (Braswell)
+#define CPUID_MODEL_BRASWELL		0x4C			// Atom (Braswell)
 #define CPUID_MODEL_AVOTON		0x4D			// Silvermont/Avoton Atom C2000 **AVN
 #define CPUID_MODEL_SKYLAKE		0x4E			// Future Core **SKL
 #define CPUID_MODEL_BRODWELL_SVR	0x4F			// Broadwell Server **BDX
 #define CPUID_MODEL_BRODWELL_MSVR	0x56			// Broadwell Micro Server, Future Xeon **BDX-DE
+//#define CPUID_MODEL_KNIGHT		0x57
 #define CPUID_MODEL_ANNIDALE		0x5A			// Silvermont, Future Atom E3000, Z3000 (Annidale)
-#define CPUID_MODEL_VALLEYVIEW      0x5D			// Silvermont, Future Atom E3000, Z3000
-#define CPUID_MODEL_SKYLAKE_S     0x5E          // Skylake **SKL
+//#define CPUID_MODEL_GOLDMONT		0x5C
+#define CPUID_MODEL_VALLEYVIEW		0x5D			// Silvermont, Future Atom E3000, Z3000
+#define CPUID_MODEL_SKYLAKE_S		0x5E			// Skylake **SKL
+//#define CPUID_MODEL_CANNONLAKE	0x66
 
 /* CPUID Vendor */
 #define	CPUID_VID_INTEL			"GenuineIntel"
Index: branches/ErmaC/Enoch/i386/libsaio/saio_types.h
===================================================================
--- branches/ErmaC/Enoch/i386/libsaio/saio_types.h	(revision 2787)
+++ branches/ErmaC/Enoch/i386/libsaio/saio_types.h	(revision 2788)
@@ -212,6 +212,7 @@
 	bool			visible;		/* will shown in the device list */
 	char			OSVersion[OSVERSTRLEN]; /* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductVersion' e.g. "10.10.10" - hope will not reach e.g. 111.222.333 soon:) If so, OSVERSTRLEN 9 change to 12 */
 	char			OSFullVer[OSVERSTRLEN]; /* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductVersion' */
+	char			OSBuildVer[OSVERSTRLEN];/* Null terminated string from '/System/Library/CoreServices/SystemVersion.plist/ProductBuildVersion' */
 	bool			OSisServer;		/* 1 = OS X server , 0 = OS X client */
 	bool			OSisInstaller;		/* 1 = OS X Install partition / recovery partition , 0 = OS X Install */