Index: trunk/i386/boot1/Makefile
===================================================================
--- trunk/i386/boot1/Makefile	(revision 2495)
+++ trunk/i386/boot1/Makefile	(revision 2496)
@@ -16,7 +16,7 @@
 VERS = `vers_string -f 5.0 | tr - .`
 NEW_VERS = Darwin boot1h v$(VERS)
 
-PROGRAMS  =  boot1hp boot1f32
+PROGRAMS  =  boot1hp boot1f32 boot1x
 
 ifeq (${CONFIG_BOOT1_HFS}, y)
 PROGRAMS += boot1h
@@ -37,7 +37,7 @@
 
 $(PROGRAMS): $(SRCROOT)/autoconf.inc
 	@echo "	[NASM] $(@F)" 
-	@$(NASM) $(@F).s -o $@
+	@$(NASM) $(@F).s -o $@ -O3
 
 install_i386:: all $(INSTALLDIR)
 	cp $(SYMROOT)/boot1h $(INSTALLDIR)/
Index: trunk/i386/boot1/boot1x.s
===================================================================
--- trunk/i386/boot1/boot1x.s	(revision 2495)
+++ trunk/i386/boot1/boot1x.s	(revision 2496)
@@ -90,8 +90,8 @@
 ;
 ; exFAT BPB
 ;
-gPartitionOffset: dq 0
-gVolumeLength: dq 0
+gPartitionOffset: dd 0, 0
+gVolumeLength: dd 0, 0
 gFATOffset: dd 0
 gFATLength: dd 0
 gClusterHeapOffset: dd 0
@@ -429,7 +429,7 @@
 .loop:
 	cmp eax, 2
 	jb .finishup
-	cmp eax, kMaxCluster
+	cmp eax, -9 ;kMaxCluster
 	jnb .finishup
 	cmp bx, kMaxContigClusters
 	jnb .finishup
Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 2495)
+++ trunk/CHANGES	(revision 2496)
@@ -1,3 +1,4 @@
+- Zenith432 : Completed patch for ExFAT support ( http://www.insanelymac.com/forum/topic/302938-exfat-volume-boot-record-for-chameleon )
 - Zenith432 : add EXFAT boot support by Zenith432
 - zenith432 : Merge patch from issue 386 (boot2 does not know how to read files from FAT partitions on GPT)
 - meklort : Update laoder.h to latest, declare gMI global, Load modules passed in via the multiboot header / first bootloader,
Index: trunk/Makefile
===================================================================
--- trunk/Makefile	(revision 2495)
+++ trunk/Makefile	(revision 2496)
@@ -76,6 +76,7 @@
 	@cp -f ${SYMROOT}/i386/boot0xg ${IMGROOT}/usr/standalone/i386
 	@cp -f ${SYMROOT}/i386/boot1h ${IMGROOT}/usr/standalone/i386
 	@cp -f ${SYMROOT}/i386/boot1f32 ${IMGROOT}/usr/standalone/i386
+	@cp -f ${SYMROOT}/i386/boot1x ${IMGROOT}/usr/standalone/i386
 ifdef CONFIG_FDISK440
 	@cp -f ${SYMROOT}/i386/fdisk440 ${IMGROOT}/usr/bin
 endif