Index: trunk/CHANGES
===================================================================
--- trunk/CHANGES	(revision 376)
+++ trunk/CHANGES	(revision 377)
@@ -1,3 +1,5 @@
+- Removed obsolete -f option, use -x instead
+- Removed -x32 option, use arch=i386 instead
 - Added automatic SMBusspeed detection for lga1156 core i5/7 cpus
 - Added new iMac11,1 sbios default model for lga1156 core i5/17 mobos
 - md0 code. Notified xnu when an md ramdisk is specified
Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 376)
+++ trunk/i386/boot2/boot.c	(revision 377)
@@ -412,10 +412,7 @@
 				archCpuType = CPU_TYPE_I386;
 			}
 		}
-		if (getValueForKey(k32BitModeFlag, &val, &len, &bootInfo->bootConfig)) {
-			archCpuType = CPU_TYPE_I386;
-		}
-		
+
 		if (!getBoolForKey (kWake, &tryresume, &bootInfo->bootConfig)) {
 			tryresume = true;
 			tryresumedefault = true;
Index: trunk/i386/boot2/boot.h
===================================================================
--- trunk/i386/boot2/boot.h	(revision 376)
+++ trunk/i386/boot2/boot.h	(revision 377)
@@ -101,7 +101,6 @@
 #define kSafeModeFlag		"-x"
 #define kIgnoreBootFileFlag	"-F"
 #define kSingleUserModeFlag	"-s"
-#define k32BitModeFlag		"-x32"
 
 /*
  * Booter behavior control