Index: branches/Chimera/.config
===================================================================
--- branches/Chimera/.config	(revision 2255)
+++ branches/Chimera/.config	(revision 2256)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Chameleon Configuration
-# Thu Jun 20 17:46:59 2013
+# Wed Aug  7 21:43:55 2013
 #
 CONFIG_OPTIMIZATION_LEVEL="-Oz"
 CONFIG_BDMESG=y
@@ -26,7 +26,4 @@
 # CONFIG_SATA_MODULE is not set
 CONFIG_KEYLAYOUT_MODULE=m
 # CONFIG_ACPICODEC_MODULE is not set
-# CONFIG_KERNELPATCHER_MODULE is not set
-CONFIG_FILENVRAM_MODULE=y
-CONFIG_HDAENABLER_MODULE=y
 # CONFIG_EMBED_THEME is not set
Index: branches/Chimera/version
===================================================================
--- branches/Chimera/version	(revision 2255)
+++ branches/Chimera/version	(revision 2256)
@@ -1 +1 @@
-2.1.1
+2.1.2
Index: branches/Chimera/autoconf.inc
===================================================================
--- branches/Chimera/autoconf.inc	(revision 2255)
+++ branches/Chimera/autoconf.inc	(revision 2256)
@@ -1,13 +1,12 @@
 ;
 ; Automatically generated make config: don't edit
 ; Chameleon Configuration
-; Thu Jun 20 17:46:59 2013
+; Wed Aug  7 21:43:55 2013
 ;
 CONFIG_BOOT1_HFS_DEBUG EQU 0
 CONFIG_SATA_MODULE EQU 0
 CONFIG_KLIBC_MODULE EQU 0
 CONFIG_BOOT0_DEBUG EQU 0
-CONFIG_HDAENABLER_MODULE EQU 1
 CONFIG_OPENUP EQU 0
 CONFIG_BOOT1_HFS_VERBOSE EQU 1
 CONFIG_EMBED_THEME EQU 0
@@ -15,11 +14,9 @@
 CONFIG_MODULES EQU 1
 CONFIG_BOOT0_VERBOSE EQU 1
 CONFIG_ACPICODEC_MODULE EQU 0
-CONFIG_KERNELPATCHER_MODULE EQU 0
 CONFIG_BDMESG EQU 1
 CONFIG_BOOT1_HFS_ACTIVE_VERBOSE EQU 1
 CONFIG_BOOT1_HFS_ACTIVE EQU 1
-CONFIG_FILENVRAM_MODULE EQU 1
 CONFIG_BOOT1_HFS_ACTIVE_DEBUG EQU 0
 CONFIG_FDISK440 EQU 1
 CONFIG_RESOLUTION_MODULE EQU 0
Index: branches/Chimera/i386/libsaio/fake_efi.c
===================================================================
--- branches/Chimera/i386/libsaio/fake_efi.c	(revision 2255)
+++ branches/Chimera/i386/libsaio/fake_efi.c	(revision 2256)
@@ -74,7 +74,7 @@
  */
 
 /* Identify ourselves as the EFI firmware vendor */
-static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'C','h','a','m','e','l','e','o','n','_','2','.','1', 0};
+static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'C','h','a','m','e','l','e','o','n','_','2','.','2', 0};
 static EFI_UINT32 const FIRMWARE_REVISION = 132; /* FIXME: Find a constant for this. */
 
 /* Default platform system_id (fix by IntVar) */
Index: branches/Chimera/i386/boot2/modules.h
===================================================================
--- branches/Chimera/i386/boot2/modules.h	(revision 2255)
+++ branches/Chimera/i386/boot2/modules.h	(revision 2256)
@@ -15,8 +15,8 @@
 #define MODULE_PATH		"/Extra/modules/"
 
 #define SYMBOLS_MODULE "Symbols.dylib"
-#define SYMBOLS_AUTHOR "Chimera"
-#define SYMBOLS_DESCRIPTION "Chimera symbols for linking"
+#define SYMBOLS_AUTHOR "Chameleon"
+#define SYMBOLS_DESCRIPTION "Chameleon symbols for linking"
 #define SYMBOLS_VERSION     0
 #define SYMBOLS_COMPAT      0
 
@@ -119,4 +119,4 @@
 /********************************************************************************/
 void dyld_stub_binder();
 
-#endif /* __BOOT_MODULES_H */
\ No newline at end of file
+#endif /* __BOOT_MODULES_H */
Index: branches/Chimera/i386/modules/Cconfig
===================================================================
--- branches/Chimera/i386/modules/Cconfig	(revision 2255)
+++ branches/Chimera/i386/modules/Cconfig	(revision 2256)
@@ -10,7 +10,4 @@
 source "i386/modules/Sata/Cconfig"
 source "i386/modules/Keylayout/Cconfig"
 source "i386/modules/ACPIcodec/Cconfig"
-source "i386/modules/KernelPatcher/Cconfig"
-source "i386/modules/FileNVRAM/Cconfig"
-source "i386/modules/HDAEnabler/Cconfig"
 endmenu
Index: branches/Chimera/i386/modules/Makefile
===================================================================
--- branches/Chimera/i386/modules/Makefile	(revision 2255)
+++ branches/Chimera/i386/modules/Makefile	(revision 2256)
@@ -11,7 +11,6 @@
 include ${SRCROOT}/Make.rules
 
 # The order of building modules is important.
-SUBDIRS = KernelPatcher
 
 ifdef CONFIG_KLIBC_MODULE
 SUBDIRS += klibc
@@ -41,14 +40,6 @@
 SUBDIRS += AcpiCodec
 endif
 
-ifdef CONFIG_FILENVRAM_MODULE
-SUBDIRS += FileNVRAM
-endif
-
-ifdef CONFIG_HDAENABLER_MODULE
-SUBDIRS += HDAEnabler
-endif
-
 CFLAGS= -O3 $(MORECPP) -arch i386 -g -static
 DEFINES=
 CONFIG = hd
Index: branches/Chimera/auto.conf
===================================================================
--- branches/Chimera/auto.conf	(revision 2255)
+++ branches/Chimera/auto.conf	(revision 2256)
@@ -1,9 +1,8 @@
 #
 # Automatically generated make config: don't edit
 # Chameleon Configuration
-# Thu Jun 20 17:46:59 2013
+# Wed Aug  7 21:43:55 2013
 #
-CONFIG_HDAENABLER_MODULE=y
 CONFIG_BOOT1_HFS_VERBOSE=y
 CONFIG_BOOT1_HFS=y
 CONFIG_MODULES=y
@@ -12,6 +11,5 @@
 CONFIG_BDMESG=y
 CONFIG_BOOT1_HFS_ACTIVE_VERBOSE=y
 CONFIG_BOOT1_HFS_ACTIVE=y
-CONFIG_FILENVRAM_MODULE=y
 CONFIG_FDISK440=y
 CONFIG_KEYLAYOUT_MODULE=m
Index: branches/Chimera/autoconf.h
===================================================================
--- branches/Chimera/autoconf.h	(revision 2255)
+++ branches/Chimera/autoconf.h	(revision 2256)
@@ -1,11 +1,10 @@
 //
 // Automatically generated make config: don't edit
 // Chameleon Configuration
-// Thu Jun 20 17:46:59 2013
+// Wed Aug  7 21:43:55 2013
 // 
 #define CONFIG_IS_BUILTIN   1
 #define CONFIG_IS_MODULE    2
-#define CONFIG_HDAENABLER_MODULE CONFIG_IS_BUILTIN
 #define CONFIG_BOOT1_HFS_VERBOSE CONFIG_IS_BUILTIN
 #define CONFIG_BOOT1_HFS CONFIG_IS_BUILTIN
 #define CONFIG_MODULES CONFIG_IS_BUILTIN
@@ -14,6 +13,5 @@
 #define CONFIG_BDMESG CONFIG_IS_BUILTIN
 #define CONFIG_BOOT1_HFS_ACTIVE_VERBOSE CONFIG_IS_BUILTIN
 #define CONFIG_BOOT1_HFS_ACTIVE CONFIG_IS_BUILTIN
-#define CONFIG_FILENVRAM_MODULE CONFIG_IS_BUILTIN
 #define CONFIG_FDISK440 CONFIG_IS_BUILTIN
 #define CONFIG_KEYLAYOUT_MODULE CONFIG_IS_MODULE
Index: branches/Chimera/CHANGES
===================================================================
--- branches/Chimera/CHANGES	(revision 2255)
+++ branches/Chimera/CHANGES	(revision 2256)
@@ -1,4 +1,6 @@
--macman: Chimera 2.1.0 specific changes:
+-macman: Chimera 2.1.2 specific changes:
+	Removed all closed source modules
+-macman: Chimera 2.1.i specific changes:
 	Rollbacked FileNVRAM.dylib to v1.1.2
 	Includes most changes from trunk r2248 while retaining all previous Chimera v2.1.0 fixes and enhancements
 - Fix issue booting x86 after rev.2175 (Credits to Mario, Alex and Leon).